github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: APDUCodeTable has more items than 100 (#682)

Browse source 
4fa0835d5f
This commit is contained in:
Oleg Moiseenko 2018-09-24 13:48:07 +03:00 • committed by pwpiwi
commit 2d4db38754
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/emv/apduinfo.c
View file

@ -255,7 +255,7 @@ const APDUCode APDUCodeTable[] = {
{"9F00", APDUCODE_TYPE_NONE, "PIN blocked and Unblock Try Counter is 3"}, {"9F00", APDUCODE_TYPE_NONE, "PIN blocked and Unblock Try Counter is 3"},
{"9F04", APDUCODE_TYPE_NONE, "PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"}, {"9F04", APDUCODE_TYPE_NONE, "PIN not succesfully verified, PIN blocked and Unblock Try Counter is 3"},
{"9FXX", APDUCODE_TYPE_NONE, "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."}, {"9FXX", APDUCODE_TYPE_NONE, "Command successfully executed; 'xx' bytes of data are available and can be requested using GET RESPONSE."},
{"9xXX", APDUCODE_TYPE_NONE, "Application related status, (ISO 7816-3)"} {"9XXX", APDUCODE_TYPE_NONE, "Application related status, (ISO 7816-3)"}
}; };
const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode); const size_t APDUCodeTableLen = sizeof(APDUCodeTable)/sizeof(APDUCode);
@ -280,11 +280,10 @@ int CodeCmp(const char *code1, const char *code2) {
const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) { const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
char buf[5] = {0}; char buf[5] = {0};
int res; int res;
int mineq = 100; int mineq = APDUCodeTableLen;
int mineqindx = 0; int mineqindx = 0;
sprintf(&buf[0], "%02X", sw1); sprintf(buf, "%02X%02X", sw1, sw2);
sprintf(&buf[2], "%02X", sw2);
for (int i = 0; i < APDUCodeTableLen; i++) { for (int i = 0; i < APDUCodeTableLen; i++) {
res = CodeCmp(APDUCodeTable[i].ID, buf); res = CodeCmp(APDUCodeTable[i].ID, buf);
@ -302,7 +301,7 @@ const APDUCode* const GetAPDUCode(uint8_t sw1, uint8_t sw2) {
} }
// if we have not equal, but with some 'X' // if we have not equal, but with some 'X'
if (mineqindx < 100) { if (mineqindx < APDUCodeTableLen) {
return &APDUCodeTable[mineqindx]; return &APDUCodeTable[mineqindx];
} }