[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-27-g24be0f2

[by Werner Koch]

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  24be0f24d3a9325a04de10ae0e5e277bf28a74fe (commit)
      from  03f0b51fe454f8dbe77c302897f7a5899c4c5380 (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 24be0f24d3a9325a04de10ae0e5e277bf28a74fe
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 25 20:25:28 2014 +0200

    scd: Support reader Gemalto IDBridge CT30
    
    * scd/ccid-driver.h (GEMPC_CT30): New product id.
    * scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
    reader.
    --
    
    GnuPG-bug-id: 1638

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 60ac576..65c2037 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -963,6 +963,11 @@ parse_ccid_descriptor (ccid_driver_t handle,
       handle->max_ifsd = 48;
     }
 
+  if (handle->id_vendor == VENDOR_GEMPC && handle->id_product == GEMPC_CT30)
+    {
+      DEBUGOUT ("enabling product quirk: disable non-null NAD\n");
+      handle->nonnull_nad = 0;
+    }
 
   return 0;
 }
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index a2a6e16..3952cd7 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -80,6 +80,7 @@ enum {
 #define CHERRY_ST2000   0x003e
 #define VASCO_920       0x0920
 #define GEMPC_PINPAD    0x3478
+#define GEMPC_CT30      0x3437
 #define VEGA_ALPHA      0x0008
 
 #endif /*CCID_DRIVER_INCLUDE_USB_IDS*/

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

Summary of changes:
 scd/ccid-driver.c |    5 +++++
 scd/ccid-driver.h |    1 +
 2 files changed, 6 insertions(+)


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