RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-19 05:33:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: some timing

Browse source
This commit is contained in:
iceman 2016-02-15 02:49:04 +01:00
parent a70fcfb655
commit 5fdf867253
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/nonce2key/nonce2key.c
View file

@ -16,6 +16,7 @@
int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) { int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
struct Crypto1State *state; struct Crypto1State *state;
uint32_t i, pos, rr = 0, nr_diff; uint32_t i, pos, rr = 0, nr_diff;
byte_t bt, ks3x[8], par[8][8]; byte_t bt, ks3x[8], par[8][8];
@ -39,17 +40,22 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
for ( i = 0; i < 8; i++) { for ( i = 0; i < 8; i++) {
nr_diff = nr | i << 5; nr_diff = nr | i << 5;
printf("| %02x |%08x|", i << 5, nr_diff); printf("| %02x |%08x| %01x | %01x |", i << 5, nr_diff, ks3x[i], ks3x[i]^5);
printf(" %01x | %01x |", ks3x[i], ks3x[i]^5);
for (pos = 0; pos < 7; pos++) printf("%01x,", par[i][pos]); for (pos = 0; pos < 7; pos++) printf("%01x,", par[i][pos]);
printf("%01x|\n", par[i][7]); printf("%01x|\n", par[i][7]);
} }
printf("+----+--------+---+-----+---------------+\n"); printf("+----+--------+---+-----+---------------+\n");
clock_t t1 = clock();
state = lfsr_common_prefix(nr, rr, ks3x, par); state = lfsr_common_prefix(nr, rr, ks3x, par);
lfsr_rollback_word(state, uid^nt, 0); lfsr_rollback_word(state, uid^nt, 0);
crypto1_get_lfsr(state, key); crypto1_get_lfsr(state, key);
crypto1_destroy(state); crypto1_destroy(state);
t1 = clock() - t1;
if ( t1 > 0 ) PrintAndLog("Time in nonce2key: %.0f ticks \n", (float)t1);
return 0; return 0;
} }
@ -167,9 +173,9 @@ int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
pcs = &mpcs; pcs = &mpcs;
uid = myuid;//(uint32_t)bytes_to_num(data + 0, 4); uid = myuid;//(uint32_t)bytes_to_num(data + 0, 4);
nt = *(uint32_t*)(data+8); nt = *(uint32_t*)(data+8);
nr_enc = *(uint32_t*)(data+12); nr_enc = *(uint32_t*)(data+12);
ar_enc = *(uint32_t*)(data+16); ar_enc = *(uint32_t*)(data+16);
crypto1_word(pcs, nr_enc , 1); crypto1_word(pcs, nr_enc , 1);
at_enc = prng_successor(nt, 96) ^ crypto1_word(pcs, 0, 0); at_enc = prng_successor(nt, 96) ^ crypto1_word(pcs, 0, 0);