Index: b/scd/ccid-driver.h
===================================================================
--- b/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -80,6 +80,7 @@
 #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*/
Index: b/scd/ccid-driver.c
===================================================================
--- b/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -963,6 +963,11 @@
       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;
 }