FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ea73bf959f4b926957a09d772cd5815da326c80b..7114945d6744906fedd8455e1e9a3dc5e12ba0fa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -214,14 +214,14 @@ start:
                }\r
        }       \r
        printf("\n");\r
+       // error\r
+       if (isOK != 1) return 1;\r
        \r
-       // par == 0,  and -4\r
-       if (isOK == -4 && par_list == 0) {\r
+       if (par_list == 0 && ks_list != 0) {\r
                // this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. \r
                // but it uses 0|1 instead of 0x60|0x61...\r
                if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){\r
-                       PrintAndLog("Key not found (lfsr_common_prefix list is null).");        \r
-                       PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
+                       PrintAndLog("Trying again with a different reader nonce...");\r
                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r
@@ -229,10 +229,7 @@ start:
                        goto END;\r
                }\r
        }\r
-       \r
-       // error\r
-       if (isOK != 1) return 1;\r
-       \r
+\r
        // execute original function from util nonce2key\r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r
@@ -1365,7 +1362,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 #define ATTACK_KEY_COUNT 8\r
 sector *k_sector = NULL;\r
 uint8_t k_sectorsCount = 16;\r
-void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {\r
+void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {\r
 \r
        // initialize storage for found keys\r
        if (k_sector == NULL)\r
@@ -1389,7 +1386,7 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {
 \r
                        // We can probably skip this, mfkey32v2 is more reliable.\r
 #ifdef HFMF_TRYMFK32\r
-                       if (tryMfk32(data[i], &key)) {\r
+                       if (tryMfk32(data[i], &key, verbose)) {\r
                                PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
                                        , (data[i].keytype) ? "B" : "A"\r
                                        , data[i].sector\r
@@ -1414,7 +1411,7 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {
                        }\r
 #endif\r
                        //moebius attack                        \r
-                       if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, showMaths)) {\r
+                       if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, verbose)) {\r
                                uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;\r
                                uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;\r
 \r
@@ -1456,7 +1453,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        bool errors = false;\r
 \r
        // If set to true, we should show our workings when doing NR_AR_ATTACK.\r
-       bool showMaths = false;\r
+       bool verbose = false;\r
 \r
        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r
@@ -1491,7 +1488,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'v':\r
                case 'V':\r
-                       showMaths = true;\r
+                       verbose = true;\r
                        cmdp++;\r
                        break;\r
                case 'x':\r
@@ -1533,7 +1530,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
                        memcpy( data, resp.d.asBytes, sizeof(data) );                   \r
-                       readerAttack(data, setEmulatorMem, showMaths);\r
+                       readerAttack(data, setEmulatorMem, verbose);\r
                }\r
                \r
                if (k_sector != NULL) {\r