github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-07 21:51:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547)

Browse source
This commit is contained in:
pwpiwi 2018-01-15 15:29:14 +01:00 • committed by GitHub
parent 8ec06f5ef3
commit d1f9ec06ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
armsrc/mifarecmd.c
View file

@ -20,6 +20,9 @@
#include "parity.h" #include "parity.h"
#include "crc.h" #include "crc.h"
#define HARDNESTED_AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation)
#define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication
// the block number for the ISO14443-4 PCB // the block number for the ISO14443-4 PCB
static uint8_t pcb_blocknum = 0; static uint8_t pcb_blocknum = 0;
// Deselect card by sending a s-block. the crc is precalced for speed // Deselect card by sending a s-block. the crc is precalced for speed
@ -677,7 +680,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
} }
if (slow) { if (slow) {
timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME; timeout = GetCountSspClk() + HARDNESTED_PRE_AUTHENTICATION_LEADTIME;
while(GetCountSspClk() < timeout); while(GetCountSspClk() < timeout);
} }
@ -694,9 +697,11 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
continue; continue;
} }
// send a dummy response in order to trigger the cards authentication failure timeout // send an incomplete dummy response in order to trigger the card's authentication failure timeout
uint8_t dummy_answer[8] = {0}; uint8_t dummy_answer[1] = {0};
ReaderTransmit(dummy_answer, 8, NULL); ReaderTransmit(dummy_answer, 1, NULL);
timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT;
num_nonces++; num_nonces++;
if (num_nonces % 2) { if (num_nonces % 2) {
@ -709,6 +714,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
i += 9; i += 9;
} }
// wait for the card to become ready again
while(GetCountSspClk() < timeout);
} }
LED_C_OFF(); LED_C_OFF();

2
armsrc/mifareutil.h
View file

@ -24,8 +24,6 @@
#define CRYPT_REQUEST 2 #define CRYPT_REQUEST 2
#define AUTH_FIRST 0 #define AUTH_FIRST 0
#define AUTH_NESTED 2 #define AUTH_NESTED 2
#define AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation)
#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication
// mifare 4bit card answers // mifare 4bit card answers
#define CARD_ACK 0x0A // 1010 - ACK #define CARD_ACK 0x0A // 1010 - ACK