Upgrade crapto1 library to v3.3 (#232)

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

diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 0e64a3e8e02b1c56f626432630ffc7e58063358e..a018c5dfbbabc3c989357876da14a2def99e1dff 100755 (executable)
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -1,10 +1,5 @@
-#define __STDC_FORMAT_MACROS

 #include <inttypes.h>
 #include <inttypes.h>

-#define llx PRIx64
-#define lli PRIi64
-
-// Test-file: test2.c
-#include "crapto1.h"
+#include "crapto1/crapto1.h"

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 


@@ -62,7 +57,7 @@ int main (int argc, char *argv[]) {
                crypto1_word(t, uid ^ nt, 0);
                crypto1_word(t, nr1_enc, 1);
                if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
                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);
+                       printf("\nFound Key: [%012" PRIx64 "]\n\n",key);

                        break;
                }
        }
                        break;
                }
        }