Finally, rewrote bootrom and flasher program, much faster now

[proxmark3-svn] / tools / mfkey / mfkey.c

diff --git a/tools/mfkey/mfkey.c b/tools/mfkey/mfkey.c
index 442403f4d6a2ef874badcb666994ad9d384f6b2c..71e35589e07dcd33abc5a4d0b0fef435c7815350 100755 (executable)
--- a/tools/mfkey/mfkey.c
+++ b/tools/mfkey/mfkey.c
@@ -11,8 +11,8 @@ int main (int argc, char *argv[]) {
   uint32_t nr_enc;  // encrypted reader challenge
   uint32_t ar_enc;  // encrypted reader response
   uint32_t at_enc;  // encrypted tag response
   uint32_t nr_enc;  // encrypted reader challenge
   uint32_t ar_enc;  // encrypted reader response
   uint32_t at_enc;  // encrypted tag response

-       uint32_t ks2;     // keystream used to encrypt reader response
-       uint32_t ks3;     // keystream used to encrypt tag response
+  uint32_t ks2;     // keystream used to encrypt reader response
+  uint32_t ks3;     // keystream used to encrypt tag response

 
   printf("MIFARE Classic key recovery\n\n");
 
 
   printf("MIFARE Classic key recovery\n\n");
 


@@ -48,7 +48,7 @@ int main (int argc, char *argv[]) {
 
   // Extract the keystream from the messages
   printf("\nKeystream used to generate {ar} and {at}:\n");
 
   // Extract the keystream from the messages
   printf("\nKeystream used to generate {ar} and {at}:\n");

-       ks2 = ar_enc ^ prng_successor(nt, 64);
+  ks2 = ar_enc ^ prng_successor(nt, 64);

   ks3 = at_enc ^ prng_successor(nt, 96);
   printf("  ks2: %08x\n",ks2);
   printf("  ks3: %08x\n",ks3);
   ks3 = at_enc ^ prng_successor(nt, 96);
   printf("  ks2: %08x\n",ks2);
   printf("  ks3: %08x\n",ks3);


@@ -60,6 +60,7 @@ int main (int argc, char *argv[]) {
   lfsr_rollback_word(revstate, uid ^ nt, 0);
   crypto1_get_lfsr(revstate, &lfsr);
   printf("\nFound Key: [%02x %02x %02x %02x %02x %02x]\n\n",plfsr[5],plfsr[4],plfsr[3],plfsr[2],plfsr[1],plfsr[0]);
   lfsr_rollback_word(revstate, uid ^ nt, 0);
   crypto1_get_lfsr(revstate, &lfsr);
   printf("\nFound Key: [%02x %02x %02x %02x %02x %02x]\n\n",plfsr[5],plfsr[4],plfsr[3],plfsr[2],plfsr[1],plfsr[0]);

+  crypto1_destroy(revstate);

 
   return 0;
 }
 
   return 0;
 }