X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/838c15a6433b1cf1726aede99fa8dcdc7862473a..62dc7d4a6f72effa3ad22fadbd5c199f496e9471:/tools/mfkey/mfkey32.c diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c index c122b77b..43e5a094 100755 --- a/tools/mfkey/mfkey32.c +++ b/tools/mfkey/mfkey32.c @@ -43,17 +43,18 @@ int main (int argc, char *argv[]) { // Generate lfsr succesors of the tag challenge printf("\nLFSR succesors of the tag challenge:\n"); - printf(" nt': %08x\n",prng_successor(nt, 64)); - printf(" nt'': %08x\n",prng_successor(nt, 96)); + uint32_t p64 = prng_successor(nt, 64); + printf(" nt': %08x\n", p64); + printf(" nt'': %08x\n", prng_successor(p64, 32)); clock_t t1 = clock(); // Extract the keystream from the messages printf("\nKeystream used to generate {ar} and {at}:\n"); - ks2 = ar0_enc ^ prng_successor(nt, 64); - printf(" ks2: %08x\n",ks2); + ks2 = ar0_enc ^ p64; + 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) { lfsr_rollback_word(t, 0, 0); @@ -62,7 +63,7 @@ int main (int argc, char *argv[]) { crypto1_get_lfsr(t, &key); crypto1_word(t, uid ^ nt, 0); 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); break;} }