CHG: extern methods.

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

diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 349b31e753bcfe68e90930e44f6db39289408c7d..9c04e9c18d3620f0c65e4183a02714917f108df5 100644 (file)
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -3,10 +3,7 @@
 #include "crapto1.h"
 #include <stdio.h>
 #include <stdlib.h>
 #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
 int main (int argc, char *argv[]) {
        struct Crypto1State *s,*t;
        uint64_t key;     // recovered key


@@ -47,16 +44,18 @@ int main (int argc, char *argv[]) {
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");

-       printf("  nt': %08x\n",prng_successor(nt0, 64));
-       printf(" nt'': %08x\n",prng_successor(nt0, 96));
-       clock_t t1 = clock();
+       uint32_t p64 = prng_successor(nt0, 64);
+       uint32_t p64b = prng_successor(nt1, 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");
 
        // Extract the keystream from the messages
        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) {
                lfsr_rollback_word(t, 0, 0);
   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);


@@ -66,12 +65,10 @@ int main (int argc, char *argv[]) {
                
                crypto1_word(t, uid ^ nt1, 0);
                crypto1_word(t, nr1_enc, 1);
                
                crypto1_word(t, uid ^ nt1, 0);
                crypto1_word(t, nr1_enc, 1);

-               if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) {
-                       printf("\nFound Key: [%012"llx"]\n\n",key);
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
+                       printf("\nFound Key: [%012" PRIx64 "]\n\n",key);

                        break;}
        }
        free(s);
                        break;}
        }
        free(s);

-       t1 = clock() - t1;
-       if ( t1 > 0 ) printf("Time : %.0f ticks \n", (float)t1 );

        return 0;
 }
        return 0;
 }