github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 06:13:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix emv search behavior

Browse source 
(taken from PRs 261 and 262 by @merlokk on https://github.com/RfidResearchGroup/proxmark3)
whitespace fixes
This commit is contained in:
pwpiwi 2019-07-25 17:41:10 +02:00
commit c42b7d4d74
1 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/emv/emvcore.c
View file

@ -290,7 +290,7 @@ struct tlvdb *GetdCVVRawFromTrack2(const struct tlv *track2) {
int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *apdu, int apdu_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON, uint8_t *apdu, int apdu_len, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv)
{ {
*ResultLen = 0; *ResultLen = 0;
if (sw) *sw = 0; if (sw) *sw = 0;
uint16_t isw = 0; uint16_t isw = 0;
int res = 0; int res = 0;
@ -579,14 +579,16 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
int retrycnt = 0; int retrycnt = 0;
for(int i = 0; i < AIDlistLen; i ++) { for(int i = 0; i < AIDlistLen; i ++) {
param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen); param_gethex_to_eol(AIDlist[i].aid, 0, aidbuf, sizeof(aidbuf), &aidlen);
res = EMVSelect(channel, (i == 0) ? ActivateField : false, (i == AIDlistLen - 1) ? LeaveFieldON : true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv); res = EMVSelect(channel, (i == 0) ? ActivateField : false, true, aidbuf, aidlen, data, sizeof(data), &datalen, &sw, tlv);
// retry if error and not returned sw error // retry if error and not returned sw error
if (res && res != 5) { if (res && res != 5) {
if (++retrycnt < 3){ if (++retrycnt < 3){
i--; i--;
} else { } else {
// (1) - card select error, proxmark error OR (200) - result length = 0 // (1) - card select error, (4) reply timeout, (200) - result length = 0
if (res == 1 || res == 200) { if (res == 1 || res == 4 || res == 200) {
if (!LeaveFieldON)
DropFieldEx(channel);
PrintAndLogEx(WARNING, "Exit..."); PrintAndLogEx(WARNING, "Exit...");
return 1; return 1;
} }
@ -610,6 +612,9 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
} }
} }
if (!LeaveFieldON)
DropFieldEx(channel);
return 0; return 0;
} }
@ -790,7 +795,7 @@ int trDDA(EMVCommandChannel channel, bool decodeTLV, struct tlvdb *tlv) {
} }
const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL); const struct tlv *sda_tlv = tlvdb_get(tlv, 0x21, NULL);
/* if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!! /* if (!sda_tlv || sda_tlv->len < 1) { it may be 0!!!!
emv_pk_free(pk); emv_pk_free(pk);
PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit."); PrintAndLogEx(WARNING, "Error: Can't find input list for Offline Data Authentication. Exit.");
return 3; return 3;