gcc10 compiler fixes:

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

diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index 4ab4bad4e10f65ffbaee1716e2f051ba9ac4e1f5..eb2f24c1589dca2a1135fbf06ab312ab09fd9d80 100755 (executable)
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -3,13 +3,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "crapto1/crapto1.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "crapto1/crapto1.h"

-#include "mfkey.h"
-#include "util.h"
+#include "mifare/mfkey.h"
+#include "util_posix.h"
+

 
 // 32 bit recover key from 2 nonces
 int main (int argc, char *argv[]) {
 
 
 // 32 bit recover key from 2 nonces
 int main (int argc, char *argv[]) {
 

-  nonces_t data;
+  nonces_t data = {0};

   uint32_t ks2;     // keystream used to encrypt reader response
   uint64_t key;     // recovered key
 
   uint32_t ks2;     // keystream used to encrypt reader response
   uint64_t key;     // recovered key
 


@@ -24,18 +25,18 @@ int main (int argc, char *argv[]) {
 
   bool moebius_attack = (argc == 8);
   
 
   bool moebius_attack = (argc == 8);
   

-  sscanf(argv[1],"%x",&data.cuid);
-  sscanf(argv[2],"%x",&data.nonce);
+  sscanf(argv[1],"%" SCNx32, &data.cuid);
+  sscanf(argv[2],"%" SCNx32, &data.nonce);

   data.nonce2 = data.nonce;
   data.nonce2 = data.nonce;

-  sscanf(argv[3],"%x",&data.nr);
-  sscanf(argv[4],"%x",&data.ar);
+  sscanf(argv[3],"%" SCNx32, &data.nr);
+  sscanf(argv[4],"%" SCNx32, &data.ar);

   if (moebius_attack) {
   if (moebius_attack) {

-         sscanf(argv[5],"%x",&data.nonce2);
-         sscanf(argv[6],"%x",&data.nr2);
-         sscanf(argv[7],"%x",&data.ar2);
+         sscanf(argv[5],"%" SCNx32, &data.nonce2);
+         sscanf(argv[6],"%" SCNx32, &data.nr2);
+         sscanf(argv[7],"%" SCNx32, &data.ar2);

   } else {
   } else {

-         sscanf(argv[5],"%x",&data.nr2);
-         sscanf(argv[6],"%x",&data.ar2);
+         sscanf(argv[5],"%" SCNx32, &data.nr2);
+         sscanf(argv[6],"%" SCNx32, &data.ar2);

   }      
 
   printf("Recovering key for:\n");
   }      
 
   printf("Recovering key for:\n");