hf {14a,mf} sim: v is for verbose

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 41528b8eee9190763d5ed19a02eedeac0032cb75..c5585386e4a9f333d9f5df9b01a6224d6985cdd6 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -143,7 +143,7 @@ int usage_hf_14a_sim(void) {
 //     PrintAndLog("    u     : 4, 7 or 10 byte UID");
        PrintAndLog("    u     : 4, 7 byte UID");
        PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
 //     PrintAndLog("    u     : 4, 7 or 10 byte UID");
        PrintAndLog("    u     : 4, 7 byte UID");
        PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");

-       PrintAndLog("    m     : (Optional) Show maths used for cracking reader. Useful for debugging.");
+       PrintAndLog("    v     : (Optional) show maths used for cracking reader. Useful for debugging.");

        PrintAndLog("\n   sample : hf 14a sim t 1 u 11223344 x");
        PrintAndLog("          : hf 14a sim t 1 u 11223344");
        PrintAndLog("          : hf 14a sim t 1 u 11223344556677");
        PrintAndLog("\n   sample : hf 14a sim t 1 u 11223344 x");
        PrintAndLog("          : hf 14a sim t 1 u 11223344");
        PrintAndLog("          : hf 14a sim t 1 u 11223344556677");


@@ -455,11 +455,6 @@ int CmdHF14ASim(const char *Cmd) {
                        case 'h':
                        case 'H':
                                return usage_hf_14a_sim();
                        case 'h':
                        case 'H':
                                return usage_hf_14a_sim();

-                       case 'm':
-                       case 'M':
-                               showMaths = true;
-                               cmdp++;
-                               break;

                        case 't':
                        case 'T':
                                // Retrieve the tag type
                        case 't':
                        case 'T':
                                // Retrieve the tag type


@@ -484,6 +479,11 @@ int CmdHF14ASim(const char *Cmd) {
                                }
                                cmdp += 2;
                                break;
                                }
                                cmdp += 2;
                                break;

+                       case 'v':
+                       case 'V':
+                               showMaths = true;
+                               cmdp++;
+                               break;

                        case 'x':
                        case 'X':
                                flags |= FLAG_NR_AR_ATTACK;
                        case 'x':
                        case 'X':
                                flags |= FLAG_NR_AR_ATTACK;

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 36896c89a045e95a20fa0bcd7fae10bd3dd8ed00..ea73bf959f4b926957a09d772cd5815da326c80b 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -32,7 +32,7 @@ int usage_hf14_mf1ksim(void){
        PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
        PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
        PrintAndLog("      e    (Optional) Fill simulator keys from what we crack");\r
        PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
        PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
        PrintAndLog("      e    (Optional) Fill simulator keys from what we crack");\r

-       PrintAndLog("      m    (Optional) Show maths used for cracking reader. Useful for debugging.");\r
+       PrintAndLog("      v    (Optional) Show maths used for cracking reader. Useful for debugging.");\r

        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r
        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r


@@ -1473,11 +1473,6 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        flags |= FLAG_INTERACTIVE;\r
                        cmdp++;\r
                        break;\r
                        flags |= FLAG_INTERACTIVE;\r
                        cmdp++;\r
                        break;\r

-               case 'm':\r
-               case 'M':\r
-                       showMaths = true;\r
-                       cmdp++;\r
-                       break;\r

                case 'n':\r
                case 'N':\r
                        exitAfterNReads = param_get8(Cmd, cmdp+1);\r
                case 'n':\r
                case 'N':\r
                        exitAfterNReads = param_get8(Cmd, cmdp+1);\r


@@ -1494,6 +1489,11 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        }\r
                        cmdp +=2;\r
                        break;\r
                        }\r
                        cmdp +=2;\r
                        break;\r

+               case 'v':\r
+               case 'V':\r
+                       showMaths = true;\r
+                       cmdp++;\r
+                       break;\r

                case 'x':\r
                case 'X':\r
                        flags |= FLAG_NR_AR_ATTACK;\r
                case 'x':\r
                case 'X':\r
                        flags |= FLAG_NR_AR_ATTACK;\r