[git] GnuPG - branch, master, updated. gnupg-2.1.15-391-gb2e1b17

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b2e1b17efa952afcf7aeec8b15e9d0088dba587a (commit)
       via  b6066ab18a67195817babaf9eccf896c2b3c7b0e (commit)
      from  8fb482252436b3b4b0b33663d95d1d17188ad1d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2e1b17efa952afcf7aeec8b15e9d0088dba587a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Nov 18 09:32:34 2016 +0900

    g10: Fix creating a lock for ToFU.
    
    * g10/tofu.c (busy_handler): Add third argument which is mandatory for
    O_CREATE flag.
    
    --
    
    Reported-by: Kristian Fiskerstrand
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index 03d8ebe..cf1d00a 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -732,7 +732,8 @@ busy_handler (void *cookie, int call_count)
          process will have to wait a bit longer, but otherwise nothing
          horrible should happen.  */
 
-      int fd = open (dbs->want_lock_file, O_CREAT);
+      int fd = open (dbs->want_lock_file, O_CREAT,
+                     S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR);
       if (fd == -1)
         log_debug ("TOFU: Error opening '%s': %s\n",
                    dbs->want_lock_file, strerror (errno));

commit b6066ab18a67195817babaf9eccf896c2b3c7b0e
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Nov 18 08:54:04 2016 +0900

    scd: Don't limit to ST-2xxx for PC/SC.
    
    * scd/apdu.c (pcsc_vendor_specific_init): Only check vender ID.
    
    --
    
    Some other products by Cherry works with pinpad, although it only works
    for smaller keys (RSA 1024).  TPDU support is good for larger keys.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/apdu.c b/scd/apdu.c
index 3e2b609..54f3b30 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1896,8 +1896,12 @@ pcsc_vendor_specific_init (int slot)
       reader_table[slot].is_spr532 = 1;
       reader_table[slot].pinpad_varlen_supported = 1;
     }
-  else if (vendor == 0x046a && product == 0x003e) /* Cherry ST-2xxx */
+  else if (vendor == 0x046a)
     {
+      /* Cherry ST-2xxx (product == 0x003e) supports TPDU level
+       * exchange.  Other products which only support short APDU level
+       * exchange only work with shorter keys like RSA 1024.
+       */
       reader_table[slot].pcsc.pinmax = 15;
       reader_table[slot].pinpad_varlen_supported = 1;
     }

-----------------------------------------------------------------------

Summary of changes:
 g10/tofu.c | 3 ++-
 scd/apdu.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org