X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/93f57590455b1c57ff09119b1de407ccd1d7ed62..2d42ea1e4dfb86bd9a68bf46354f03a990f85fed:/tools/nonce2key/nonce2key.c

diff --git a/tools/nonce2key/nonce2key.c b/tools/nonce2key/nonce2key.c
index afe1b7ef..9cee06d6 100644
--- a/tools/nonce2key/nonce2key.c
+++ b/tools/nonce2key/nonce2key.c
@@ -1,13 +1,13 @@
-#include "crapto1.h"
+#include "crapto1/crapto1.h"
 #include <inttypes.h>
 #include <stdio.h>
 typedef unsigned char byte_t;
 
 int main(const int argc, const char* argv[]) {
   struct Crypto1State *state;
-  uint32_t pos, uid, nt, nr, rr, nr_diff, ks1, ks2;
+  uint32_t pos, uid, nt, nr, rr, nr_diff;
   byte_t bt, i, ks3x[8], par[8][8];
-  uint64_t key, key_recovered;
+  uint64_t key_recovered;
   uint64_t par_info;
   uint64_t ks_info;
   nr = rr = 0;
@@ -18,13 +18,13 @@ int main(const int argc, const char* argv[]) {
   }
   sscanf(argv[1],"%08x",&uid);
   sscanf(argv[2],"%08x",&nt);
-  sscanf(argv[3],"%016llx",&par_info);
-  sscanf(argv[4],"%016llx",&ks_info);
+  sscanf(argv[3],"%016" SCNx64,&par_info);
+  sscanf(argv[4],"%016" SCNx64,&ks_info);
   
   // Reset the last three significant bits of the reader nonce
   nr &= 0xffffff1f;
   
-  printf("\nuid(%08x) nt(%08x) par(%016llx) ks(%016llx)\n\n",uid,nt,par_info,ks_info);
+  printf("\nuid(%08x) nt(%08x) par(%016" PRIx64 ") ks(%016" PRIx64 ")\n\n",uid,nt,par_info,ks_info);
 
   for (pos=0; pos<8; pos++)
   {
@@ -47,10 +47,10 @@ int main(const int argc, const char* argv[]) {
     printf("%01x|\n",par[i][7]);
   }
   
-  state = lfsr_common_prefix(nr,rr,ks3x,par);
+  state = lfsr_common_prefix(nr,rr,ks3x,par,0);
   lfsr_rollback_word(state,uid^nt,0);
   crypto1_get_lfsr(state,&key_recovered);
-  printf("\nkey recovered: %012llx\n\n",key_recovered);
+  printf("\nkey recovered: %012" PRIx64 "\n\n",key_recovered);
   crypto1_destroy(state);
   
   return 0;