X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d2f487af9cc29122d86ca4f349ba825aaf98748c..3be2a5ae0b3f153a60a04ff83b7c3f864d716371:/armsrc/iso14443a.c diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index aa97e6e9..3f775de5 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -652,7 +652,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) { } LED_A_OFF(); - + rsamples += 4; if(MillerDecoding((data[0] & 0xF0) >> 4)) { LED_C_ON(); @@ -2325,13 +2325,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t * //Collect AR/NR if(ar_nr_collected < 2){ - if(ar_nr_responses[ar_nr_collected*4+2] != ar) - {// Avoid duplicates - ar_nr_collected++; + if(ar_nr_responses[2] != ar) + {// Avoid duplicates... probably not necessary, ar should vary. ar_nr_responses[ar_nr_collected*4] = cuid; ar_nr_responses[ar_nr_collected*4+1] = nonce; ar_nr_responses[ar_nr_collected*4+2] = ar; ar_nr_responses[ar_nr_collected*4+3] = nr; + ar_nr_collected++; } } @@ -2606,7 +2606,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t * if(ar_nr_collected > 1) { Dbprintf("Collected two pairs of AR/NR which can be used to extract keys from reader:"); - Dbprintf("../tools/mfcrack32 %08x %08x %08x %08x", + Dbprintf("../tools/mfkey/mfkey32 %08x %08x %08x %08x", ar_nr_responses[0], // UID ar_nr_responses[1], //NT ar_nr_responses[2], //AR1