CHG: started to clean up the crapto1 imp in client/nonce2key/ folder.

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 00252661d04360cd1e29ddd93ac825deee377a03..cf0f5c131199aad6eaf59d937377b1e6149de272 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1218,10 +1218,12 @@ int CmdHF14AMf1kSim(const char *Cmd)
                }\r
                pnr +=2;\r
        }\r
+       \r
        if (param_getchar(Cmd, pnr) == 'n') {\r
                exitAfterNReads = param_get8(Cmd,pnr+1);\r
                pnr += 2;\r
        }\r
+       \r
        if (param_getchar(Cmd, pnr) == 'i' ) {\r
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_INTERACTIVE;\r
@@ -1232,10 +1234,13 @@ int CmdHF14AMf1kSim(const char *Cmd)
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_NR_AR_ATTACK;\r
        }\r
+       \r
        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
                                flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
                                                                                          flags & FLAG_7B_UID_IN_DATA   ? sprint_hex(uid,7): "N/A"\r
-                               , exitAfterNReads, flags,flags);\r
+                               , exitAfterNReads\r
+                               , flags\r
+                               , flags);\r
 \r
 \r
        UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
@@ -1250,40 +1255,39 @@ int CmdHF14AMf1kSim(const char *Cmd)
 \r
                UsbCommand resp;                \r
                PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
-               //while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
-                       //We're waiting only 1.5 s at a time, otherwise we get the\r
-                       // annoying message about "Waiting for a response... "\r
-               //}\r
-               while(!ukbhit() ){\r
-                       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) continue;\r
+\r
+               while( !ukbhit() ){\r
+                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
+                       \r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
-                                       memset(data, 0x00, sizeof(data));\r
-                                       memset(key, 0x00, sizeof(key));\r
-                                       int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
-                                       \r
-                                       memcpy(data, resp.d.asBytes, len);\r
-                                       \r
-                                       uint64_t corr_uid = 0;\r
-                                       if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
-                                               corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
-                               tryMfk32(corr_uid, data, key);\r
-                       } else {\r
-                                               corr_uid |= (uint64_t)data[2] << 48; \r
-                                               corr_uid |= (uint64_t)data[1] << 40; \r
-                                               corr_uid |= (uint64_t)data[0] << 32;\r
-                                               corr_uid |= (uint64_t)data[7] << 24;\r
-                                               corr_uid |= (uint64_t)data[6] << 16;\r
-                                               corr_uid |= (uint64_t)data[5] << 8;\r
-                                               corr_uid |= (uint64_t)data[4];\r
-                               tryMfk64(corr_uid, data, key);\r
-                                       }\r
-                                       PrintAndLog("--");\r
+                               memset(data, 0x00, sizeof(data));\r
+                               memset(key, 0x00, sizeof(key));\r
+                               int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
+                               \r
+                               memcpy(data, resp.d.asBytes, len);\r
+                               \r
+                               uint64_t corr_uid = 0;\r
+                               \r
+                               // this IF?  what was I thinking of?\r
+                               if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
+                                       corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
+                                       tryMfk32(corr_uid, data, key);\r
+                               } else {\r
+                                       corr_uid |= (uint64_t)data[2] << 48; \r
+                                       corr_uid |= (uint64_t)data[1] << 40; \r
+                                       corr_uid |= (uint64_t)data[0] << 32;\r
+                                       corr_uid |= (uint64_t)data[7] << 24;\r
+                                       corr_uid |= (uint64_t)data[6] << 16;\r
+                                       corr_uid |= (uint64_t)data[5] << 8;\r
+                                       corr_uid |= (uint64_t)data[4];\r
+                                       tryMfk64(corr_uid, data, key);\r
                                }\r
-                       }\r
-       \r
+                       PrintAndLog("--");\r
+               }\r
+       }\r
        return 0;\r
 }\r
 \r