aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-01-05 08:14:11 +0000
committerWerner Koch <[email protected]>2011-01-05 08:14:11 +0000
commit7d24ffaf805074fce14fed0b22e413cf5ca00024 (patch)
tree197b76006df3f9a8c94fbb2535d8cff58adfd62e
parentRename README.SVN also in Makefile (diff)
downloadgnupg-7d24ffaf805074fce14fed0b22e413cf5ca00024.tar.gz
gnupg-7d24ffaf805074fce14fed0b22e413cf5ca00024.zip
Support the gnuk token pinpad code.
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/ccid-driver.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 41c64a5b3..41a0f76e1 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-05 Werner Koch <[email protected]>
+
+ * ccid-driver.c (ccid_transceive_secure): Support the gnuk token.
+
2010-11-16 Werner Koch <[email protected]>
* 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 b71ff6aef..98268c00c 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