[git] GnuPG - branch, master, updated. gnupg-2.1.0beta1-30-g7d24ffa

[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  7d24ffaf805074fce14fed0b22e413cf5ca00024 (commit)
      from  dc5d9b140094ce5a89216119c34303ea48358c26 (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 7d24ffaf805074fce14fed0b22e413cf5ca00024
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 5 09:14:11 2011 +0100

    Support the gnuk token pinpad code.

diff --git a/scd/ChangeLog b/scd/ChangeLog
index 41c64a5..41a0f76 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-05  Werner Koch  <wk at g10code.com>
+
+	* ccid-driver.c (ccid_transceive_secure): Support the gnuk token.
+
 2010-11-16  Werner Koch  <wk at g10code.com>
 
 	* apdu.c (PCSC_UNKNOWN) [W32]: Fix all these values which don't
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index b71ff6a..98268c0 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -209,7 +209,8 @@ enum {
   VENDOR_SCM    = 0x04e6,
   VENDOR_OMNIKEY= 0x076b,
   VENDOR_GEMPC  = 0x08e6,
-  VENDOR_KAAN   = 0x0d46
+  VENDOR_KAAN   = 0x0d46,
+  VENDOR_FSIJ	= 0x234B
 };
 
 /* A list and a table with special transport descriptions. */
@@ -3072,6 +3073,7 @@ ccid_transceive_secure (ccid_driver_t handle,
     {
     case VENDOR_SCM:  /* Tested with SPR 532. */
     case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */
+    case VENDOR_FSIJ: /* Tested with the gnuk code (2011-01-05).  */
       break;
     case VENDOR_CHERRY:
       /* The CHERRY XX44 keyboard echos an asterisk for each entered

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

Summary of changes:
 scd/ChangeLog     |    4 ++++
 scd/ccid-driver.c |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)


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