Updated clone/sim cmd help + minor text fixes

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

diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index c122b77b8ef5021d2c96a411fa19a19fd6eab55d..1196868d42103a7c77d5bad62255b3385dfb6960 100755 (executable)
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -3,10 +3,7 @@
 #include "crapto1.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 
-#define llx PRIx64
-#define lli PRIi64
 int main (int argc, char *argv[]) {
        struct Crypto1State *s,*t;
        uint64_t key;     // recovered key
@@ -43,17 +40,16 @@ 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));
-
-       clock_t t1 = clock();
-               
+       uint32_t p64 = prng_successor(nt, 64);
+       printf("  nt': %08x\n", p64);
+       printf(" nt'': %08x\n", prng_successor(p64, 32));
+       
        // 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,12 +58,10 @@ 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))) {
-                       printf("\nFound Key: [%012"llx"]\n\n",key);
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
+                       printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
                        break;}
        }
        free(s);
-       t1 = clock() - t1;
-       if ( t1 > 0 ) printf("Time : %.0f ticks \n", (float)t1);
        return 0;
 }