]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
chg: @piwi's code cleanup and some more.
[proxmark3-svn] / client / cmdhfmf.c
index e6568f59f64b70d8304bc35918d506b754b52fda..20bb59298630cebabff7bb686253830b7e714584 100644 (file)
@@ -226,7 +226,7 @@ start:
                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r
-                       PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+                       PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);\r
                        goto END;\r
                }\r
        }\r
@@ -246,10 +246,10 @@ start:
                uint64_t key64 = 0;\r
                int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);\r
                if ( res > 0 ) {\r
-                       PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);       \r
+                       PrintAndLog("Candidate Key found (%012" PRIx64 ") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);  \r
                        goto start;\r
                }\r
-               PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+               PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);\r
        }\r
 END:\r
        t1 = clock() - t1;\r
@@ -313,9 +313,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
-       \r
-       char cmdp       = 0x00;\r
-\r
+       char cmdp = 0x00;\r
 \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
@@ -1207,7 +1205,7 @@ int CmdHF14AMfChk(const char *Cmd) {
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
-                                       PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r
@@ -1400,7 +1398,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {
                uint8_t sector = data.sector;\r
                uint8_t keytype = data.keytype;\r
 \r
-               PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012"llx"]"\r
+               PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"\r
                        , keytype ? "B" : "A"\r
                        , sector\r
                        , key\r
@@ -1707,7 +1705,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
        time(&start);\r
        \r
        if (mfKeyBrute( blockNo, keytype, key, &foundkey))\r
-               PrintAndLog("Found valid key: %012"llx" \n", foundkey);\r
+               PrintAndLog("Found valid key: %012" PRIx64 " \n", foundkey);\r
        else\r
                PrintAndLog("Key not found");\r
        \r
@@ -1725,7 +1723,7 @@ void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
        PrintAndLog("|sec|key A           |res|key B           |res|");\r
        PrintAndLog("|---|----------------|---|----------------|---|");\r
        for (uint8_t i = 0; i < sectorscnt; ++i) {\r
-               PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
+               PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %d |", i,\r
                        e_sector[i].Key[0], e_sector[i].foundKey[0], \r
                        e_sector[i].Key[1], e_sector[i].foundKey[1]\r
                );\r
@@ -1774,7 +1772,6 @@ int CmdHF14AMfESet(const char *Cmd)
 {\r
        uint8_t memBlock[16];\r
        uint8_t blockNo = 0;\r
-\r
        memset(memBlock, 0x00, sizeof(memBlock));\r
 \r
        if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {\r
@@ -2056,7 +2053,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                }\r
                keyA = bytes_to_num(data, 6);\r
                keyB = bytes_to_num(data + 10, 6);\r
-               PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);\r
+               PrintAndLog("|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);\r
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r
Impressum, Datenschutz