github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: 'hf mf nack' - adjustments in return values..

Browse source 
add: 'hf 14a info -n'  added new parameter,  to enable test for nack bug.
This commit is contained in:
iceman1001 2017-12-06 00:34:57 +01:00
commit 56dbf3ea15
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
armsrc/iso14443a.c
View file

@ -2606,7 +2606,7 @@ void DetectNACKbug() {
// Test if the action was cancelled // Test if the action was cancelled
if(BUTTON_PRESS()) { if(BUTTON_PRESS()) {
isOK = -1; isOK = 99;
break; break;
} }
@ -2675,7 +2675,7 @@ void DetectNACKbug() {
unexpected_random++; unexpected_random++;
if (unexpected_random > MAX_UNEXPECTED_RANDOM) { if (unexpected_random > MAX_UNEXPECTED_RANDOM) {
// Card has an unpredictable PRNG. Give up // Card has an unpredictable PRNG. Give up
isOK = -3; isOK = 98;
break; break;
} else { } else {
if (sync_cycles <= 0) { if (sync_cycles <= 0) {
@ -2687,7 +2687,7 @@ void DetectNACKbug() {
} }
if (++sync_tries > MAX_SYNC_TRIES) { if (++sync_tries > MAX_SYNC_TRIES) {
isOK = -4; // Card's PRNG runs at an unexpected frequency or resets unexpectedly isOK = 97; // Card's PRNG runs at an unexpected frequency or resets unexpectedly
break; break;
} }
@ -2697,7 +2697,7 @@ void DetectNACKbug() {
sync_cycles += PRNG_SEQUENCE_LENGTH; sync_cycles += PRNG_SEQUENCE_LENGTH;
if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) { if (sync_cycles > PRNG_SEQUENCE_LENGTH * 2 ) {
isOK = -4; // Card's PRNG runs at an unexpected frequency or resets unexpectedly isOK = 96; // Card's PRNG runs at an unexpected frequency or resets unexpectedly
break; break;
} }

8
client/cmdhf14a.c
View file

@ -166,6 +166,7 @@ int usage_hf_14a_info(void){
PrintAndLog("This command makes more extensive tests against a ISO14443a tag in order to collect information"); PrintAndLog("This command makes more extensive tests against a ISO14443a tag in order to collect information");
PrintAndLog("Usage: hf 14a info [h|s]"); PrintAndLog("Usage: hf 14a info [h|s]");
PrintAndLog(" s silent (no messages)"); PrintAndLog(" s silent (no messages)");
PrintAndLog(" n test for nack bug");
return 0; return 0;
} }
@ -274,6 +275,8 @@ int CmdHF14AInfo(const char *Cmd) {
if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_hf_14a_info(); if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_hf_14a_info();
bool silent = (Cmd[0] == 's' || Cmd[0] == 'S'); bool silent = (Cmd[0] == 's' || Cmd[0] == 'S');
bool do_nack_test = (Cmd[0] == 'n' || Cmd[0] == 'N');
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
@ -494,7 +497,10 @@ int CmdHF14AInfo(const char *Cmd) {
if ( detect_classic_prng() ) if ( detect_classic_prng() )
PrintAndLog("Prng detection: WEAK"); PrintAndLog("Prng detection: WEAK");
else else
PrintAndLog("Prng detection: HARDEND (hardnested)"); PrintAndLog("Prng detection: HARDEND (hardnested)");
if ( do_nack_test )
detect_classic_nackbug(silent);
} }
return select_status; return select_status;

8
client/mifarehost.c
View file

@ -890,13 +890,15 @@ int detect_classic_nackbug(bool verbose){
PrintAndLog("Num of received NACK : %u", nacks); PrintAndLog("Num of received NACK : %u", nacks);
} }
switch( ok ) { switch( ok ) {
case -1 : if (verbose) PrintAndLog("Button pressed. Aborted."); return 0; case 99 : if (verbose) PrintAndLog("Button pressed. Aborted."); return 0;
case -3 : if (verbose) PrintAndLog("Card random number generator is not predictable)."); return 0; case 96 :
case -4 : if (verbose) { case 98 : if (verbose) PrintAndLog("Card random number generator is not predictable)."); return 0;
case 97 : if (verbose) {
PrintAndLog("Card random number generator seems to be based on the well-known generating polynomial"); PrintAndLog("Card random number generator seems to be based on the well-known generating polynomial");
PrintAndLog("with 16 effective bits only, but shows unexpected behavior, try again."); PrintAndLog("with 16 effective bits only, but shows unexpected behavior, try again.");
return 0; return 0;
} }
case 2 : PrintAndLog("Always leak NACK detected"); return 3; case 2 : PrintAndLog("Always leak NACK detected"); return 3;
case 1 : PrintAndLog("NACK bug detected"); return 1; case 1 : PrintAndLog("NACK bug detected"); return 1;
case 0 : PrintAndLog("No NACK bug detected"); return 2; case 0 : PrintAndLog("No NACK bug detected"); return 2;