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

there was bug in hf mf mifare. and speed up this command.

Browse source
This commit is contained in:
Merlokbr@gmail.com 2012-11-08 09:48:02 +00:00
commit bfaecce6eb
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/iso14443a.c
View file

@ -1850,11 +1850,12 @@ void ReaderMifare(uint32_t parameter)
while(TRUE) while(TRUE)
{ {
LED_C_ON();
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
SpinDelay(200);
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
LED_C_OFF(); LED_C_OFF();
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
SpinDelay(10);
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
LED_C_ON();
SpinDelay(2);
// Test if the action was cancelled // Test if the action was cancelled
if(BUTTON_PRESS()) { if(BUTTON_PRESS()) {

17
client/cmdhfmf.c
View file

@ -71,17 +71,22 @@ start:
if (isOK != 1) return 1; if (isOK != 1) return 1;
// execute original function from util nonce2key // execute original function from util nonce2key
if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2; if (nonce2key(uid, nt, par_list, ks_list, &r_key))
printf("------------------------------------------------------------------\n"); {
PrintAndLog("Key found:%012llx \n", r_key); isOK = 2;
PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
} else {
printf("------------------------------------------------------------------\n");
PrintAndLog("Key found:%012llx \n", r_key);
num_to_bytes(r_key, 6, keyBlock); num_to_bytes(r_key, 6, keyBlock);
isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key); isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
}
if (!isOK) if (!isOK)
PrintAndLog("Found valid key:%012llx", r_key); PrintAndLog("Found valid key:%012llx", r_key);
else else
{ {
PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);
c.arg[0] = nt; c.arg[0] = nt;
goto start; goto start;
} }

16
client/nonce2key/nonce2key.c
View file

@ -14,7 +14,7 @@
#include "ui.h" #include "ui.h"
int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key) { int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
struct Crypto1State *state; struct Crypto1State *state, *state_s;
uint32_t pos, nr, rr, nr_diff;//, ks1, ks2; uint32_t pos, nr, rr, nr_diff;//, ks1, ks2;
byte_t bt, i, ks3x[8], par[8][8]; byte_t bt, i, ks3x[8], par[8][8];
uint64_t key_recovered; uint64_t key_recovered;
@ -47,9 +47,17 @@ int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, ui
} }
state = lfsr_common_prefix(nr, rr, ks3x, par); state = lfsr_common_prefix(nr, rr, ks3x, par);
lfsr_rollback_word(state, uid^nt, 0); state_s = 0;
crypto1_get_lfsr(state, &key_recovered); for (i = 0; (state) && ((state + i)->odd != 0 || (state + i)->even != 0) && (i < 10); i++)
crypto1_destroy(state); {
printf("%08x|%08x\n",(state+i)->odd, (state+i)->even);
state_s = state + i;
}
if (!state_s) return 1;
lfsr_rollback_word(state_s, uid^nt, 0);
crypto1_get_lfsr(state_s, &key_recovered);
if (!state) free(state);
*key = key_recovered; *key = key_recovered;

1
client/nonce2key/nonce2key.h
View file

@ -15,6 +15,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "crapto1.h" #include "crapto1.h"
#include "common.h" #include "common.h"