VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

- fixed parse errors

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@210 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-07-12 11:28:12 +00:00
parent 98269eca38
commit 367afc4406
3 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ccid/patches/ccid-1.3.11.patch
View File

@@ -87,7 +87,7 @@ Index: ccid-1.3.11/src/commands.c
/*****************************************************************************
@@ -691,7 +703,299 @@
@@ -691,7 +703,304 @@
return ret;
} /* SecurePINModify */
@@ -106,15 +106,20 @@ Index: ccid-1.3.11/src/commands.c
+ }
+ switch (input[parsed]) {
+ case 0x01:
+ DEBUG_INFO("Initiating PACE with MRZ");
+ DEBUG_COMM("Initiating PACE with MRZ");
+ break;
+ case 0x02:
+ DEBUG_INFO("Initiating PACE with CAN");
+ DEBUG_COMM("Initiating PACE with CAN");
+ break;
+ case 0x03:
+ DEBUG_INFO("Initiating PACE with PIN");
+ DEBUG_COMM("Initiating PACE with PIN");
+ break;
+ case 0x04:
+ DEBUG_INFO("Initiating PACE with PUK");
+ DEBUG_COMM("Initiating PACE with PUK");
+ break;
+ default:
+ DEBUG_INFO("Initiating PACE with unknown PACE secret type");
+ DEBUG_COMM("Initiating PACE with unknown PACE secret type");
+ break;
+ }
+ parsed += 1;
+
@@ -165,7 +170,7 @@ Index: ccid-1.3.11/src/commands.c
+ }
+ if (lengthCertificateDescription)
+ DEBUG_INFO_XXD("Certificate description:\n", &input[parsed], lengthCertificateDescription);
+ parsed += lengthCHAT;
+ parsed += lengthCertificateDescription;
+
+ if (parsed != input_length) {
+ DEBUG_CRITICAL2("Overrun by %d bytes", input_length - parsed);
@@ -186,7 +191,7 @@ Index: ccid-1.3.11/src/commands.c
+ DEBUG_CRITICAL("Malformed Establish PACE Channel output data.");
+ return IFD_COMMUNICATION_ERROR;
+ }
+ DEBUG_INFO3("MSE:Set AT Statusbytes: %02X %02X",
+ DEBUG_COMM3("MSE:Set AT Statusbytes: %02X %02X",
+ output[parsed+0], output[parsed+1]);
+ parsed += 2;
+
@@ -387,7 +392,7 @@ Index: ccid-1.3.11/src/commands.c
/*****************************************************************************
*
* Escape
@@ -2081,3 +2385,15 @@
@@ -2081,3 +2390,15 @@
buffer[3] = (value >> 24) & 0xFF;
} /* i2dw */

53
ccid/patches/ccid-1.3.13.patch
View File

@@ -1,7 +1,7 @@
Index: ccid-1.3.13/src/ifdhandler.c
Index: ccid-1.3.11/src/ifdhandler.c
===================================================================
--- ccid-1.3.13/src/ifdhandler.c (Revision 4979)
+++ ccid-1.3.13/src/ifdhandler.c (Arbeitskopie)
--- ccid-1.3.11/src/ifdhandler.c (Revision 4979)
+++ ccid-1.3.11/src/ifdhandler.c (Arbeitskopie)
@@ -1384,6 +1384,16 @@
iBytesReturned += sizeof(PCSC_TLV_STRUCTURE);
}
@@ -63,10 +63,10 @@ Index: ccid-1.3.13/src/ifdhandler.c
if (IFD_SUCCESS != return_value)
*pdwBytesReturned = 0;
Index: ccid-1.3.13/src/commands.c
Index: ccid-1.3.11/src/commands.c
===================================================================
--- ccid-1.3.13/src/commands.c (Revision 4979)
+++ ccid-1.3.13/src/commands.c (Arbeitskopie)
--- ccid-1.3.11/src/commands.c (Revision 4979)
+++ ccid-1.3.11/src/commands.c (Arbeitskopie)
@@ -68,7 +68,19 @@
unsigned int tx_length, unsigned char tx_buffer[], unsigned int *rx_length,
unsigned char rx_buffer[]);
@@ -87,7 +87,7 @@ Index: ccid-1.3.13/src/commands.c
/*****************************************************************************
@@ -712,7 +724,299 @@
@@ -712,7 +724,304 @@
return ret;
} /* SecurePINModify */
@@ -106,15 +106,20 @@ Index: ccid-1.3.13/src/commands.c
+ }
+ switch (input[parsed]) {
+ case 0x01:
+ DEBUG_INFO("Initiating PACE with MRZ");
+ DEBUG_COMM("Initiating PACE with MRZ");
+ break;
+ case 0x02:
+ DEBUG_INFO("Initiating PACE with CAN");
+ DEBUG_COMM("Initiating PACE with CAN");
+ break;
+ case 0x03:
+ DEBUG_INFO("Initiating PACE with PIN");
+ DEBUG_COMM("Initiating PACE with PIN");
+ break;
+ case 0x04:
+ DEBUG_INFO("Initiating PACE with PUK");
+ DEBUG_COMM("Initiating PACE with PUK");
+ break;
+ default:
+ DEBUG_INFO("Initiating PACE with unknown PACE secret type");
+ DEBUG_COMM("Initiating PACE with unknown PACE secret type");
+ break;
+ }
+ parsed += 1;
+
@@ -165,7 +170,7 @@ Index: ccid-1.3.13/src/commands.c
+ }
+ if (lengthCertificateDescription)
+ DEBUG_INFO_XXD("Certificate description:\n", &input[parsed], lengthCertificateDescription);
+ parsed += lengthCHAT;
+ parsed += lengthCertificateDescription;
+
+ if (parsed != input_length) {
+ DEBUG_CRITICAL2("Overrun by %d bytes", input_length - parsed);
@@ -186,7 +191,7 @@ Index: ccid-1.3.13/src/commands.c
+ DEBUG_CRITICAL("Malformed Establish PACE Channel output data.");
+ return IFD_COMMUNICATION_ERROR;
+ }
+ DEBUG_INFO3("MSE:Set AT Statusbytes: %02X %02X",
+ DEBUG_COMM3("MSE:Set AT Statusbytes: %02X %02X",
+ output[parsed+0], output[parsed+1]);
+ parsed += 2;
+
@@ -387,7 +392,7 @@ Index: ccid-1.3.13/src/commands.c
/*****************************************************************************
*
* Escape
@@ -2113,3 +2417,15 @@
@@ -2113,3 +2422,15 @@
buffer[3] = (value >> 24) & 0xFF;
} /* i2dw */
@@ -403,10 +408,10 @@ Index: ccid-1.3.13/src/commands.c
+ buffer[1] = (value >> 8) & 0xFF;
+} /* i2w */
+
Index: ccid-1.3.13/src/commands.h
Index: ccid-1.3.11/src/commands.h
===================================================================
--- ccid-1.3.13/src/commands.h (Revision 4979)
+++ ccid-1.3.13/src/commands.h (Arbeitskopie)
--- ccid-1.3.11/src/commands.h (Revision 4979)
+++ ccid-1.3.11/src/commands.h (Arbeitskopie)
@@ -37,6 +37,14 @@
unsigned char TxBuffer[], unsigned int TxLength,
unsigned char RxBuffer[], unsigned int *RxLength);
@@ -422,10 +427,10 @@ Index: ccid-1.3.13/src/commands.h
RESPONSECODE CmdEscape(unsigned int reader_index,
const unsigned char TxBuffer[], unsigned int TxLength,
unsigned char RxBuffer[], unsigned int *RxLength);
Index: ccid-1.3.13/src/ccid.h
Index: ccid-1.3.11/src/ccid.h
===================================================================
--- ccid-1.3.13/src/ccid.h (Revision 4979)
+++ ccid-1.3.13/src/ccid.h (Arbeitskopie)
--- ccid-1.3.11/src/ccid.h (Revision 4979)
+++ ccid-1.3.11/src/ccid.h (Arbeitskopie)
@@ -142,8 +142,10 @@
#define CCID_CLASS_EXCHANGE_MASK 0x00070000
@@ -448,10 +453,10 @@ Index: ccid-1.3.13/src/ccid.h
/* all the data rates specified by ISO 7816-3 Fi/Di tables */
#define ISO_DATA_RATES 10753, 14337, 15625, 17204, \
Index: ccid-1.3.13/src/ccid_ifdhandler.h
Index: ccid-1.3.11/src/ccid_ifdhandler.h
===================================================================
--- ccid-1.3.13/src/ccid_ifdhandler.h (Revision 4979)
+++ ccid-1.3.13/src/ccid_ifdhandler.h (Arbeitskopie)
--- ccid-1.3.11/src/ccid_ifdhandler.h (Revision 4979)
+++ ccid-1.3.11/src/ccid_ifdhandler.h (Arbeitskopie)
@@ -37,6 +37,8 @@
SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC)
#define IOCTL_FEATURE_GET_TLV_PROPERTIES \

23
ccid/patches/pcsclite_trunk_r5063.patch → ccid/patches/pcsclite_trunk_r5067.patch
View File

@@ -1,6 +1,6 @@
Index: PCSC/src/PCSC/reader.h.in
===================================================================
--- PCSC/src/PCSC/reader.h.in (Revision 5063)
--- PCSC/src/PCSC/reader.h.in (Revision 5067)
+++ PCSC/src/PCSC/reader.h.in (Arbeitskopie)
@@ -121,6 +121,7 @@
#define FEATURE_IFD_DISPLAY_PROPERTIES 0x11
@@ -12,7 +12,7 @@ Index: PCSC/src/PCSC/reader.h.in
* "IFDs with Secure Pin Entry Capabilities" */
Index: Drivers/ccid/src/ifdhandler.c
===================================================================
--- Drivers/ccid/src/ifdhandler.c (Revision 5063)
--- Drivers/ccid/src/ifdhandler.c (Revision 5067)
+++ Drivers/ccid/src/ifdhandler.c (Arbeitskopie)
@@ -1417,6 +1417,16 @@
iBytesReturned += sizeof(PCSC_TLV_STRUCTURE);
@@ -77,7 +77,7 @@ Index: Drivers/ccid/src/ifdhandler.c
Index: Drivers/ccid/src/commands.c
===================================================================
--- Drivers/ccid/src/commands.c (Revision 5063)
--- Drivers/ccid/src/commands.c (Revision 5067)
+++ Drivers/ccid/src/commands.c (Arbeitskopie)
@@ -68,7 +68,19 @@
unsigned int tx_length, unsigned char tx_buffer[], unsigned int *rx_length,
@@ -99,7 +99,7 @@ Index: Drivers/ccid/src/commands.c
/*****************************************************************************
@@ -712,7 +724,299 @@
@@ -712,7 +724,304 @@
return ret;
} /* SecurePINModify */
@@ -119,14 +119,19 @@ Index: Drivers/ccid/src/commands.c
+ switch (input[parsed]) {
+ case 0x01:
+ DEBUG_COMM("Initiating PACE with MRZ");
+ break;
+ case 0x02:
+ DEBUG_COMM("Initiating PACE with CAN");
+ break;
+ case 0x03:
+ DEBUG_COMM("Initiating PACE with PIN");
+ break;
+ case 0x04:
+ DEBUG_COMM("Initiating PACE with PUK");
+ break;
+ default:
+ DEBUG_COMM("Initiating PACE with unknown PACE secret type");
+ break;
+ }
+ parsed += 1;
+
@@ -177,7 +182,7 @@ Index: Drivers/ccid/src/commands.c
+ }
+ if (lengthCertificateDescription)
+ DEBUG_INFO_XXD("Certificate description:\n", &input[parsed], lengthCertificateDescription);
+ parsed += lengthCHAT;
+ parsed += lengthCertificateDescription;
+
+ if (parsed != input_length) {
+ DEBUG_CRITICAL2("Overrun by %d bytes", input_length - parsed);
@@ -399,7 +404,7 @@ Index: Drivers/ccid/src/commands.c
/*****************************************************************************
*
* Escape
@@ -2113,3 +2417,15 @@
@@ -2113,3 +2422,15 @@
buffer[3] = (value >> 24) & 0xFF;
} /* i2dw */
@@ -417,7 +422,7 @@ Index: Drivers/ccid/src/commands.c
+
Index: Drivers/ccid/src/commands.h
===================================================================
--- Drivers/ccid/src/commands.h (Revision 5063)
--- Drivers/ccid/src/commands.h (Revision 5067)
+++ Drivers/ccid/src/commands.h (Arbeitskopie)
@@ -37,6 +37,14 @@
unsigned char TxBuffer[], unsigned int TxLength,
@@ -436,7 +441,7 @@ Index: Drivers/ccid/src/commands.h
unsigned char RxBuffer[], unsigned int *RxLength);
Index: Drivers/ccid/src/ccid.h
===================================================================
--- Drivers/ccid/src/ccid.h (Revision 5063)
--- Drivers/ccid/src/ccid.h (Revision 5067)
+++ Drivers/ccid/src/ccid.h (Arbeitskopie)
@@ -142,8 +142,10 @@
#define CCID_CLASS_EXCHANGE_MASK 0x00070000
@@ -462,7 +467,7 @@ Index: Drivers/ccid/src/ccid.h
#define ISO_DATA_RATES 10753, 14337, 15625, 17204, \
Index: Drivers/ccid/src/ccid_ifdhandler.h
===================================================================
--- Drivers/ccid/src/ccid_ifdhandler.h (Revision 5063)
--- Drivers/ccid/src/ccid_ifdhandler.h (Revision 5067)
+++ Drivers/ccid/src/ccid_ifdhandler.h (Arbeitskopie)
@@ -37,6 +37,8 @@
SCARD_CTL_CODE(FEATURE_IFD_PIN_PROPERTIES + CLASS2_IOCTL_MAGIC)