github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 02:26:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add tag nonce to error message

Browse source
This commit is contained in:
LW 2019-12-17 19:56:14 -08:00
commit b461e6e367
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhfmf.c
View file

@ -712,7 +712,7 @@ int CmdHF14AMfNested(const char *Cmd)
case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
case -4 : PrintAndLog("Tag isn't vulnerable to Nested Attack (tag nonce is static).\n"); break;
case -4 : key64 = bytes_to_num(keyBlock, 4); PrintAndLog("Tag isn't vulnerable to Nested Attack (tag nonce:%08X is static).\n", key64); break;
default : PrintAndLog("Unknown Error.\n");
}
return 2;
@ -798,7 +798,7 @@ int CmdHF14AMfNested(const char *Cmd)
case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;
case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;
case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;
case -4 : PrintAndLog("Tag isn't vulnerable to Nested Attack (tag nonce is static).\n"); break;
case -4 : key64 = bytes_to_num(keyBlock, 4); PrintAndLog("Tag isn't vulnerable to Nested Attack (tag nonce:%08X is static).\n", key64); break;
default : PrintAndLog("Unknown Error.\n");
}
free(e_sector);

2
client/mifare/mifarehost.c
View file

@ -344,6 +344,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
}
if (resp.arg[0]) {
memcpy(&statelists[0].nt, (void *)(resp.d.asBytes + 4 + 1 * 8 + 0), 4);
num_to_bytes(statelists[0].nt, 4, resultKey);
return resp.arg[0]; // error during nested
}