|
 |
10b547 |
diff -up ccid-1.4.26/src/ccid.c.omnikey ccid-1.4.26/src/ccid.c
|
|
|
10b547 |
--- ccid-1.4.26/src/ccid.c.omnikey 2017-02-24 10:04:25.742132234 +0100
|
|
|
10b547 |
+++ ccid-1.4.26/src/ccid.c 2017-02-24 10:07:26.145976335 +0100
|
|
|
10b547 |
@@ -55,8 +55,16 @@ int ccid_open_hack_pre(unsigned int read
|
|
|
10b547 |
{
|
|
|
10b547 |
_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
|
|
|
10b547 |
|
|
|
10b547 |
+ ccid_descriptor->dwNonStandardFlags = 0;
|
|
|
10b547 |
+
|
|
|
10b547 |
switch (ccid_descriptor->readerID)
|
|
|
10b547 |
{
|
|
|
10b547 |
+ case CARDMAN3121:
|
|
|
10b547 |
+ ccid_descriptor->dwNonStandardFlags = CCID_NON_STAND_OMK_3121_T1;
|
|
|
10b547 |
+ ccid_descriptor->dwFeatures &= ~CCID_CLASS_EXCHANGE_MASK;
|
|
|
10b547 |
+ ccid_descriptor->dwFeatures |= CCID_CLASS_TPDU;
|
|
|
10b547 |
+ break;
|
|
|
10b547 |
+
|
|
|
10b547 |
case MYSMARTPAD:
|
|
|
10b547 |
ccid_descriptor->dwMaxIFSD = 254;
|
|
|
10b547 |
break;
|
|
|
10b547 |
diff -up ccid-1.4.26/src/ccid.h.omnikey ccid-1.4.26/src/ccid.h
|
|
|
10b547 |
--- ccid-1.4.26/src/ccid.h.omnikey 2017-01-07 15:50:47.000000000 +0100
|
|
|
10b547 |
+++ ccid-1.4.26/src/ccid.h 2017-02-24 10:04:25.742132234 +0100
|
|
|
10b547 |
@@ -137,6 +137,7 @@ typedef struct
|
|
|
10b547 |
*/
|
|
|
10b547 |
char zlp;
|
|
|
10b547 |
#endif
|
|
|
10b547 |
+ unsigned int dwNonStandardFlags;
|
|
|
10b547 |
} _ccid_descriptor;
|
|
|
10b547 |
|
|
|
10b547 |
/* Features from dwFeatures */
|
|
|
10b547 |
@@ -153,6 +154,9 @@ typedef struct
|
|
|
10b547 |
#define CCID_CLASS_EXTENDED_APDU 0x00040000
|
|
|
10b547 |
#define CCID_CLASS_EXCHANGE_MASK 0x00070000
|
|
|
10b547 |
|
|
|
10b547 |
+/* Features from the swNonStandardFlags */
|
|
|
10b547 |
+#define CCID_NON_STAND_OMK_3121_T1 0x00000001
|
|
|
10b547 |
+
|
|
|
10b547 |
/* Features from bPINSupport */
|
|
|
10b547 |
#define CCID_CLASS_PIN_VERIFY 0x01
|
|
|
10b547 |
#define CCID_CLASS_PIN_MODIFY 0x02
|
|
|
10b547 |
diff -up ccid-1.4.26/src/commands.c.omnikey ccid-1.4.26/src/commands.c
|
|
|
10b547 |
--- ccid-1.4.26/src/commands.c.omnikey 2017-01-07 15:50:47.000000000 +0100
|
|
|
10b547 |
+++ ccid-1.4.26/src/commands.c 2017-02-24 10:11:21.297778870 +0100
|
|
|
10b547 |
@@ -1292,6 +1292,39 @@ RESPONSECODE CmdXfrBlock(unsigned int re
|
|
|
10b547 |
return return_value;
|
|
|
10b547 |
} /* CmdXfrBlock */
|
|
|
10b547 |
|
|
|
10b547 |
+static RESPONSECODE omnikey_transmit_tpdu(unsigned int reader_index,
|
|
|
10b547 |
+ _ccid_descriptor *ccid_descriptor, unsigned int tx_length,
|
|
|
10b547 |
+ const unsigned char *tx_buffer)
|
|
|
10b547 |
+{
|
|
|
10b547 |
+ unsigned char cmd[11+CMD_BUF_SIZE]; /* CCID + APDU buffer */
|
|
|
10b547 |
+ status_t ret;
|
|
|
10b547 |
+
|
|
|
10b547 |
+ cmd[0] = 0x6B; /* 3121 escape */
|
|
|
10b547 |
+ i2dw(tx_length+1, cmd+1); /* APDU length */
|
|
|
10b547 |
+ cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
|
|
|
10b547 |
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
|
|
|
10b547 |
+ cmd[7] = 0;
|
|
|
10b547 |
+ cmd[8] = 0;
|
|
|
10b547 |
+ cmd[9] = 0;
|
|
|
10b547 |
+ cmd[10] = 0x1A;
|
|
|
10b547 |
+
|
|
|
10b547 |
+ /* check that the command is not too large */
|
|
|
10b547 |
+ if (tx_length > CMD_BUF_SIZE)
|
|
|
10b547 |
+ {
|
|
|
10b547 |
+ DEBUG_CRITICAL2("TX Length too big: %d", tx_length);
|
|
|
10b547 |
+ return IFD_NOT_SUPPORTED;
|
|
|
10b547 |
+ }
|
|
|
10b547 |
+
|
|
|
10b547 |
+ memcpy(cmd+11, tx_buffer, tx_length);
|
|
|
10b547 |
+
|
|
|
10b547 |
+ ret = WritePort(reader_index, 11+tx_length, cmd);
|
|
|
10b547 |
+ if (STATUS_NO_SUCH_DEVICE == ret)
|
|
|
10b547 |
+ return IFD_NO_SUCH_DEVICE;
|
|
|
10b547 |
+ if (ret != STATUS_SUCCESS)
|
|
|
10b547 |
+ return IFD_COMMUNICATION_ERROR;
|
|
|
10b547 |
+
|
|
|
10b547 |
+ return IFD_SUCCESS;
|
|
|
10b547 |
+} /* omnikey_transmit_tpdu */
|
|
|
10b547 |
|
|
|
10b547 |
/*****************************************************************************
|
|
|
10b547 |
*
|
|
|
10b547 |
@@ -1348,6 +1381,13 @@ RESPONSECODE CCID_Transmit(unsigned int
|
|
|
10b547 |
}
|
|
|
10b547 |
#endif
|
|
|
10b547 |
|
|
|
10b547 |
+ /* hack for Onmikey 3121 */
|
|
|
10b547 |
+ if ((ccid_descriptor->dwNonStandardFlags & CCID_NON_STAND_OMK_3121_T1) &&
|
|
|
10b547 |
+ (ccid_descriptor->cardProtocol == SCARD_PROTOCOL_T1)) {
|
|
|
10b547 |
+ return omnikey_transmit_tpdu(reader_index, ccid_descriptor, tx_length,
|
|
|
10b547 |
+ tx_buffer);
|
|
|
10b547 |
+ }
|
|
|
10b547 |
+
|
|
|
10b547 |
cmd[0] = 0x6F; /* XfrBlock */
|
|
|
10b547 |
i2dw(tx_length, cmd+1); /* APDU length */
|
|
|
10b547 |
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
|
|
|
10b547 |
@@ -1373,8 +1413,9 @@ RESPONSECODE CCID_Transmit(unsigned int
|
|
|
10b547 |
RESPONSECODE CCID_Receive(unsigned int reader_index, unsigned int *rx_length,
|
|
|
10b547 |
unsigned char rx_buffer[], unsigned char *chain_parameter)
|
|
|
10b547 |
{
|
|
|
10b547 |
- unsigned char cmd[10+CMD_BUF_SIZE]; /* CCID + APDU buffer */
|
|
|
10b547 |
+ unsigned char cmd[11+CMD_BUF_SIZE]; /* CCID + APDU buffer */
|
|
|
10b547 |
unsigned int length;
|
|
|
10b547 |
+ unsigned char *rx_ptr = cmd+10;
|
|
|
10b547 |
RESPONSECODE return_value = IFD_SUCCESS;
|
|
|
10b547 |
status_t ret;
|
|
|
10b547 |
_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
|
|
|
10b547 |
@@ -1565,6 +1606,14 @@ time_request:
|
|
|
10b547 |
}
|
|
|
10b547 |
|
|
|
10b547 |
length = dw2i(cmd, 1);
|
|
|
10b547 |
+
|
|
|
10b547 |
+ if (length &&
|
|
|
10b547 |
+ (ccid_descriptor->dwNonStandardFlags & CCID_NON_STAND_OMK_3121_T1) &&
|
|
|
10b547 |
+ (ccid_descriptor->cardProtocol == SCARD_PROTOCOL_T1)) {
|
|
|
10b547 |
+ length--;
|
|
|
10b547 |
+ rx_ptr = cmd+11;
|
|
|
10b547 |
+ }
|
|
|
10b547 |
+
|
|
|
10b547 |
if (length <= *rx_length)
|
|
|
10b547 |
*rx_length = length;
|
|
|
10b547 |
else
|
|
|
10b547 |
@@ -1581,7 +1630,7 @@ time_request:
|
|
|
10b547 |
}
|
|
|
10b547 |
else
|
|
|
10b547 |
if (length)
|
|
|
10b547 |
- memcpy(rx_buffer, cmd+10, length);
|
|
|
10b547 |
+ memcpy(rx_buffer, rx_ptr, length);
|
|
|
10b547 |
|
|
|
10b547 |
/* Extended case?
|
|
|
10b547 |
* Only valid for RDR_to_PC_DataBlock frames */
|