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 - now uses NG

Browse source
This commit is contained in:
iceman1001 2019-05-15 07:47:46 -04:00
commit bfe2cff383
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
armsrc/iso14443a.c
View file

@ -2806,8 +2806,8 @@ void DetectNACKbug() {
uint8_t par[1] = {0}; // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough uint8_t par[1] = {0}; // maximum 8 Bytes to be sent here, 1 byte parity is therefore enough
uint32_t nt = 0, previous_nt = 0, nt_attacked = 0, cuid = 0; uint32_t nt = 0, previous_nt = 0, nt_attacked = 0, cuid = 0;
int32_t isOK = 0, catch_up_cycles = 0, last_catch_up = 0; int32_t catch_up_cycles = 0, last_catch_up = 0;
uint8_t cascade_levels = 0, num_nacks = 0; uint8_t cascade_levels = 0, num_nacks = 0, isOK = 0;
uint16_t elapsed_prng_sequences = 1; uint16_t elapsed_prng_sequences = 1;
uint16_t consecutive_resyncs = 0; uint16_t consecutive_resyncs = 0;
uint16_t unexpected_random = 0; uint16_t unexpected_random = 0;
@ -2816,6 +2816,8 @@ void DetectNACKbug() {
bool have_uid = false; bool have_uid = false;
bool received_nack; bool received_nack;
int32_t status = PM3_SUCCESS;
// Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces). // Mifare Classic's random generator repeats every 2^16 cycles (and so do the nonces).
int32_t sync_cycles = PRNG_SEQUENCE_LENGTH; int32_t sync_cycles = PRNG_SEQUENCE_LENGTH;
@ -2843,7 +2845,7 @@ void DetectNACKbug() {
// Test if the action was cancelled // Test if the action was cancelled
if (BUTTON_PRESS()) { if (BUTTON_PRESS()) {
isOK = 99; status = PM3_EOPABORTED;
break; break;
} }
@ -3001,6 +3003,7 @@ void DetectNACKbug() {
// tried all 256 possible parities without success. // tried all 256 possible parities without success.
if (par[0] == 0) { if (par[0] == 0) {
// did we get one NACK?
if (num_nacks == 1) if (num_nacks == 1)
isOK = 1; isOK = 1;
break; break;
@ -3012,8 +3015,15 @@ void DetectNACKbug() {
// num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ? // num_nacks = number of nacks recieved. should be only 1. if not its a clone card which always sends NACK (parity == 0) ?
// i = number of authentications sent. Not always 256, since we are trying to sync but close to it. // i = number of authentications sent. Not always 256, since we are trying to sync but close to it.
reply_mix(CMD_ACK, isOK, num_nacks, i, 0, 0);
uint8_t *data = BigBuf_malloc(4);
data[0] = isOK;
data[1] = num_nacks;
num_to_bytes(i, 2, data + 2);
reply_ng(CMD_MIFARE_NACK_DETECT, status, data, 4);
//reply_mix(CMD_ACK, isOK, num_nacks, i, 0, 0);
BigBuf_free();
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff(); LEDsoff();
set_tracing(false); set_tracing(false);

2
armsrc/mifarecmd.c
View file

@ -1998,7 +1998,7 @@ void OnSuccessMagic() {
} }
void OnErrorMagic(uint8_t reason) { void OnErrorMagic(uint8_t reason) {
// ACK, ISOK, reason,0,0,0 // ACK, ISOK, reason,0,0,0
reply_old(CMD_ACK, 0, reason, 0, 0, 0); reply_mix(CMD_ACK, 0, reason, 0, 0, 0);
OnSuccessMagic(); OnSuccessMagic();
} }

17
client/mifare/mifarehost.c
View file

@ -921,10 +921,16 @@ int detect_classic_nackbug(bool verbose) {
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
if (WaitForResponseTimeout(CMD_ACK, &resp, 500)) { if (WaitForResponseTimeout(CMD_MIFARE_NACK_DETECT, &resp, 500)) {
int32_t ok = resp.oldarg[0];
uint32_t nacks = resp.oldarg[1]; if ( resp.status == PM3_EOPABORTED ) {
uint32_t auths = resp.oldarg[2]; PrintAndLogEx(WARNING, "button pressed. Aborted.");
return PM3_EOPABORTED;
}
uint8_t ok = resp.data.asBytes[0];
uint8_t nacks = resp.data.asBytes[1];
uint16_t auths = bytes_to_num(resp.data.asBytes + 2, 2);
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
if (verbose) { if (verbose) {
@ -932,9 +938,6 @@ int detect_classic_nackbug(bool verbose) {
PrintAndLogEx(SUCCESS, "num of received NACK : %u", nacks); PrintAndLogEx(SUCCESS, "num of received NACK : %u", nacks);
} }
switch (ok) { switch (ok) {
case 99 :
PrintAndLogEx(WARNING, "button pressed. Aborted.");
return PM3_EOPABORTED;
case 96 : case 96 :
case 98 : { case 98 : {
if (verbose) if (verbose)