RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-10 17:49:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: 'hf mf mifare' - warning if select card failed but continue searching

Browse source 
chg: 'hf mf nack' - warning if select card failed but continue searching
This commit is contained in:
iceman1001 2017-12-05 18:18:20 +01:00
parent 8b3ff03599
commit db82738527
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
armsrc/iso14443a.c
View file

@ -2376,8 +2376,8 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
if (!have_uid) { // need a full select cycle to get the uid first if (!have_uid) { // need a full select cycle to get the uid first
iso14a_card_select_t card_info; iso14a_card_select_t card_info;
if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) { if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
if (MF_DBGLEVEL >= 4) Dbprintf("Mifare: Can't select card (ALL)"); if (MF_DBGLEVEL >= 1) Dbprintf("Mifare: Can't select card (ALL)");
break; continue;
} }
switch (card_info.uidlen) { switch (card_info.uidlen) {
case 4 : cascade_levels = 1; break; case 4 : cascade_levels = 1; break;
@ -2388,7 +2388,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
have_uid = true; have_uid = true;
} else { // no need for anticollision. We can directly select the card } else { // no need for anticollision. We can directly select the card
if (!iso14443a_fast_select_card(uid, cascade_levels)) { if (!iso14443a_fast_select_card(uid, cascade_levels)) {
if (MF_DBGLEVEL >= 4) Dbprintf("Mifare: Can't select card (UID)"); if (MF_DBGLEVEL >= 1) Dbprintf("Mifare: Can't select card (UID)");
continue; continue;
} }
} }
@ -2604,8 +2604,8 @@ void DetectNACKbug() {
if (!have_uid) { // need a full select cycle to get the uid first if (!have_uid) { // need a full select cycle to get the uid first
iso14a_card_select_t card_info; iso14a_card_select_t card_info;
if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) { if (!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {
if (MF_DBGLEVEL >= 4) Dbprintf("Mifare: Can't select card (ALL)"); if (MF_DBGLEVEL >= 1) Dbprintf("Mifare: Can't select card (ALL)");
break; continue;
} }
switch (card_info.uidlen) { switch (card_info.uidlen) {
case 4 : cascade_levels = 1; break; case 4 : cascade_levels = 1; break;
@ -2616,7 +2616,7 @@ void DetectNACKbug() {
have_uid = true; have_uid = true;
} else { // no need for anticollision. We can directly select the card } else { // no need for anticollision. We can directly select the card
if (!iso14443a_fast_select_card(uid, cascade_levels)) { if (!iso14443a_fast_select_card(uid, cascade_levels)) {
if (MF_DBGLEVEL >= 4) Dbprintf("Mifare: Can't select card (UID)"); if (MF_DBGLEVEL >= 1) Dbprintf("Mifare: Can't select card (UID)");
continue; continue;
} }
} }