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

fixed parsing of modification input

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@528 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-09-14 14:07:28 +00:00
parent bef62adbfc
commit b66134e000
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ccid/src/ccid.c
View File

@@ -1231,9 +1231,11 @@ perform_PC_to_RDR_Secure(const __u8 *in, size_t inlen, __u8** out, size_t *outle
bNumberMessage = modify->bNumberMessage; bNumberMessage = modify->bNumberMessage;
/* bTeoPrologue adds another 3 bytes */ /* bTeoPrologue adds another 3 bytes */
abPINApdu = (__u8*) modify + sizeof *modify + 3*(sizeof(__u8)); abPINApdu = (__u8*) modify + sizeof *modify + 3*(sizeof(__u8));
apdulen = __le32_to_cpu(request->dwLength) - sizeof *modify - 4*sizeof(__u8);
if (bNumberMessage != 0x00) { if (bNumberMessage != 0x00) {
/* bMsgIndex2 is present */ /* bMsgIndex2 is present */
abPINApdu++; abPINApdu++;
apdulen--;
if (abDatalen < sizeof *modify + 4*(sizeof(__u8))) { if (abDatalen < sizeof *modify + 4*(sizeof(__u8))) {
sc_debug(ctx, SC_LOG_DEBUG_VERBOSE, "Not enough data for abPINDataStucture_Modification_t"); sc_debug(ctx, SC_LOG_DEBUG_VERBOSE, "Not enough data for abPINDataStucture_Modification_t");
sc_result = SC_ERROR_INVALID_DATA; sc_result = SC_ERROR_INVALID_DATA;
@@ -1243,6 +1245,7 @@ perform_PC_to_RDR_Secure(const __u8 *in, size_t inlen, __u8** out, size_t *outle
if (bNumberMessage == 0x03) { if (bNumberMessage == 0x03) {
/* bMsgIndex3 is present */ /* bMsgIndex3 is present */
abPINApdu++; abPINApdu++;
apdulen--;
if (abDatalen < sizeof *modify + 5*(sizeof(__u8))) { if (abDatalen < sizeof *modify + 5*(sizeof(__u8))) {
sc_debug(ctx, SC_LOG_DEBUG_VERBOSE, "Not enough data for abPINDataStucture_Modification_t"); sc_debug(ctx, SC_LOG_DEBUG_VERBOSE, "Not enough data for abPINDataStucture_Modification_t");
sc_result = SC_ERROR_INVALID_DATA; sc_result = SC_ERROR_INVALID_DATA;
@@ -1250,7 +1253,6 @@ perform_PC_to_RDR_Secure(const __u8 *in, size_t inlen, __u8** out, size_t *outle
} }
} }
} }
apdulen = __le32_to_cpu(request->dwLength) - sizeof *modify - sizeof(__u8);
break; break;
case 0x10: case 0x10: