CHG: extern methods.

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

diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index b09eeaeb8aec5110be7fe397e176818682ccd933..bf1226ba8912136fe1c6b83a688410ce06bcec81 100755 (executable)
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -1,11 +1,9 @@
 #define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#include "crapto1.h"
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
-
-#define llx PRIx64
-#define lli PRIi64
+#include <inttypes.h>
+#include "crapto1.h"
 
 int main (int argc, char *argv[]) {
        struct Crypto1State *revstate;
@@ -38,7 +36,7 @@ int main (int argc, char *argv[]) {
        for (int i = 0; i < encc; i++) {
                enclen[i] = strlen(argv[i + 6]) / 2;
                for (int i2 = 0; i2 < enclen[i]; i2++) {
-                       sscanf(argv[i+6] + i2*2,"%2x", (uint8_t*)&enc[i][i2]);
+                       sscanf(argv[i+6] + i2*2, "%2x", (unsigned int *)&enc[i][i2]);
                }
        }
        
@@ -63,8 +61,6 @@ int main (int argc, char *argv[]) {
        printf("  nt': %08x\n",prng_successor(nt, 64));
        printf(" nt'': %08x\n",prng_successor(nt, 96));
        
-       clock_t t1 = clock();
-       
        // Extract the keystream from the messages
        printf("\nKeystream used to generate {ar} and {at}:\n");
        ks2 = ar_enc ^ prng_successor(nt, 64);
@@ -97,10 +93,7 @@ int main (int argc, char *argv[]) {
        lfsr_rollback_word(revstate, nr_enc, 1);
        lfsr_rollback_word(revstate, uid ^ nt, 0);
        crypto1_get_lfsr(revstate, &key);
-       printf("\nFound Key: [%012"llx"]\n\n",key);
+       printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
        crypto1_destroy(revstate);
-  
-       t1 = clock() - t1;
-       if ( t1 > 0 ) printf("Time : %.0f ticks \n", (float)t1);
        return 0;
 }