Cleanup armsrc/string.c and string.h (#964)

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

diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c
index 4e9876c50524fe5ac0a9d9a8f86f4946822babe5..c8837c7ef03a894f53e7012bf9040c1a2427979c 100755 (executable)
--- a/tools/mfkey/mfkey64.c
+++ b/tools/mfkey/mfkey64.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdio.h>

-#include <strings.h>
+#include <string.h>

 #include <inttypes.h>
 #include "crapto1/crapto1.h"
 #include <inttypes.h>
 #include "crapto1/crapto1.h"

-#include "util.h"
+#include "util_posix.h"

 
 int main (int argc, char *argv[]) 
 {
 
 int main (int argc, char *argv[]) 
 {


@@ -28,11 +28,11 @@ int main (int argc, char *argv[])
        int enclen[encc];
        uint8_t enc[encc][120]; 
 
        int enclen[encc];
        uint8_t enc[encc][120]; 
 

-       sscanf(argv[1], "%x", &uid);
-       sscanf(argv[2], "%x", &nt);
-       sscanf(argv[3], "%x", &nr_enc);
-       sscanf(argv[4], "%x", &ar_enc);
-       sscanf(argv[5], "%x", &at_enc);
+       sscanf(argv[1], "%" SCNx32, &uid);
+       sscanf(argv[2], "%" SCNx32, &nt);
+       sscanf(argv[3], "%" SCNx32, &nr_enc);
+       sscanf(argv[4], "%" SCNx32, &ar_enc);
+       sscanf(argv[5], "%" SCNx32, &at_enc);

        for (int i = 0; i < encc; i++) {
                enclen[i] = strlen(argv[i + 6]) / 2;
                for (int i2 = 0; i2 < enclen[i]; i2++) {
        for (int i = 0; i < encc; i++) {
                enclen[i] = strlen(argv[i + 6]) / 2;
                for (int i2 = 0; i2 < enclen[i]; i2++) {