CHG: moved to header file

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

diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 7183a5479ce7bd0301251d82c945637072fec891..92ac371fa383b20068991a25fdc1d95a0d23100d 100644 (file)
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -1,13 +1,12 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>

-#define llx PRIx64
-#define lli PRIi64
-
-// Test-file: test2.c

 #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


@@ -21,11 +20,11 @@ int main (int argc, char *argv[]) {
        uint32_t ks2;     // keystream used to encrypt reader response
 
        printf("MIFARE Classic key recovery - based 32 bits of keystream  VERSION2\n");
        uint32_t ks2;     // keystream used to encrypt reader response
 
        printf("MIFARE Classic key recovery - based 32 bits of keystream  VERSION2\n");

-       printf("Recover key from two 32-bit reader authentication answers only");
+       printf("Recover key from two 32-bit reader authentication answers only\n");

        printf("This version implements Moebius two different nonce solution (like the supercard)\n\n");
 
        if (argc < 8) {
        printf("This version implements Moebius two different nonce solution (like the supercard)\n\n");
 
        if (argc < 8) {

-               printf(" syntax: %s <uid> <nt> <{nr_0}> <{ar_0}> <nt1> <{nr_1}> <{ar_1}>\n\n",argv[0]);
+               printf("syntax: %s <uid> <nt> <nr_0> <ar_0> <nt1> <nr_1> <ar_1>\n\n", argv[0]);

                return 1;
        }
 
                return 1;
        }
 


@@ -48,15 +47,20 @@ 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));
+       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));
+       clock_t t1 = clock();

 
        // 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,11 +70,12 @@ 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))) {
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {

                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }
        free(s);
                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }
        free(s);

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

        return 0;
 }
        return 0;
 }