github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: change the number of calls to prng_successor was done. Fewer should mean faster :)

Browse source
This commit is contained in:
iceman1001 2016-08-24 12:35:24 +02:00
commit a1ab594e24
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/mfkey/mfkey32.c
View file

@ -43,17 +43,18 @@ int main (int argc, char *argv[]) {
// Generate lfsr succesors of the tag challenge // Generate lfsr succesors of the tag challenge
printf("\nLFSR succesors of the tag challenge:\n"); printf("\nLFSR succesors of the tag challenge:\n");
printf(" nt': %08x\n",prng_successor(nt, 64)); uint32_t p64 = prng_successor(nt, 64);
printf(" nt'': %08x\n",prng_successor(nt, 96)); printf(" nt': %08x\n", p64);
printf(" nt'': %08x\n", prng_successor(p64, 32));
clock_t t1 = clock(); clock_t t1 = clock();
// Extract the keystream from the messages // Extract the keystream from the messages
printf("\nKeystream used to generate {ar} and {at}:\n"); printf("\nKeystream used to generate {ar} and {at}:\n");
ks2 = ar0_enc ^ prng_successor(nt, 64); ks2 = ar0_enc ^ p64;
printf(" ks2: %08x\n", ks2); printf(" ks2: %08x\n", ks2);
s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0); s = lfsr_recovery32(ar0_enc ^ p64, 0);
for(t = s; t->odd | t->even; ++t) { for(t = s; t->odd | t->even; ++t) {
lfsr_rollback_word(t, 0, 0); lfsr_rollback_word(t, 0, 0);
@ -62,7 +63,7 @@ int main (int argc, char *argv[]) {
crypto1_get_lfsr(t, &key); crypto1_get_lfsr(t, &key);
crypto1_word(t, uid ^ nt, 0); crypto1_word(t, uid ^ nt, 0);
crypto1_word(t, nr1_enc, 1); crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) { if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
printf("\nFound Key: [%012"llx"]\n\n",key); printf("\nFound Key: [%012"llx"]\n\n",key);
break;} break;}
} }

14
tools/mfkey/mfkey32v2.c
View file

@ -47,16 +47,20 @@ int main (int argc, char *argv[]) {
// Generate lfsr succesors of the tag challenge // Generate lfsr succesors of the tag challenge
printf("\nLFSR succesors of the tag challenge:\n"); printf("\nLFSR succesors of the tag challenge:\n");
printf(" nt': %08x\n",prng_successor(nt0, 64)); uint32_t p64 = prng_successor(nt0, 64);
printf(" nt'': %08x\n",prng_successor(nt0, 96)); uint32_t p64b = prng_successor(nt1, 64);
printf(" nt': %08x\n", p64);
printf(" nt'': %08x\n", prng_successor(p64, 32));
clock_t t1 = clock(); clock_t t1 = clock();
// Extract the keystream from the messages // Extract the keystream from the messages
printf("\nKeystream used to generate {ar} and {at}:\n"); printf("\nKeystream used to generate {ar} and {at}:\n");
ks2 = ar0_enc ^ prng_successor(nt0, 64); ks2 = ar0_enc ^ p64;
printf(" ks2: %08x\n",ks2); printf(" ks2: %08x\n",ks2);
s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0); s = lfsr_recovery32(ar0_enc ^ p64, 0);
for(t = s; t->odd | t->even; ++t) { for(t = s; t->odd | t->even; ++t) {
lfsr_rollback_word(t, 0, 0); lfsr_rollback_word(t, 0, 0);
@ -66,7 +70,7 @@ int main (int argc, char *argv[]) {
crypto1_word(t, uid ^ nt1, 0); crypto1_word(t, uid ^ nt1, 0);
crypto1_word(t, nr1_enc, 1); crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) { if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
printf("\nFound Key: [%012"llx"]\n\n",key); printf("\nFound Key: [%012"llx"]\n\n",key);
break;} break;}
} }