Skip to content

Commit 5e8a831

Browse files
authored
Merge pull request #3000 from zinongli/calypso_mobib_improve
`hf 14b mobib`: Less Strict Loop Logic
2 parents cb40726 + 8b4eba0 commit 5e8a831

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

client/src/cmdhf14b.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,12 +2797,12 @@ static int CmdHF14BCalypsoRead(const char *Cmd) {
27972797
}
27982798

27992799
uint16_t sw = get_sw(response, resplen);
2800-
if (sw != ISO7816_OK) {
2801-
PrintAndLogEx(INFO, "%s - command failed (%04x - %s).", cmds[i].desc, sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
2802-
continue;
2800+
if (sw == ISO7816_OK) {
2801+
PrintAndLogEx(SUCCESS, "%-22s - %s", cmds[i].desc, sprint_hex(response, resplen - 2));
2802+
} else {
2803+
PrintAndLogEx(INFO, "%-22s - Sending command failed (%04x - %s).", cmds[i].desc, sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
28032804
}
2804-
2805-
PrintAndLogEx(INFO, "%-22s - %s", cmds[i].desc, sprint_hex(response, resplen - 2));
2805+
28062806
activate_field = false;
28072807
}
28082808

@@ -2968,12 +2968,11 @@ static int CmdHF14BMobibRead(const char *Cmd) {
29682968
}
29692969

29702970
uint16_t sw = get_sw(response, resplen);
2971-
if (sw != ISO7816_OK) {
2972-
PrintAndLogEx(ERR, "Sending command failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
2973-
switch_off_field_14b();
2974-
return PM3_ESOFT;
2971+
if (sw == ISO7816_OK) {
2972+
PrintAndLogEx(SUCCESS, "%-22s - %s", cmds[i].desc, sprint_hex(response, resplen - 2));
2973+
} else {
2974+
PrintAndLogEx(INFO, "%-22s - Sending command failed (%04x - %s).", cmds[i].desc, sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
29752975
}
2976-
PrintAndLogEx(INFO, "%-22s - %s", cmds[i].desc, sprint_hex(response, resplen - 2));
29772976
activate_field = false;
29782977
}
29792978

0 commit comments

Comments
 (0)