small improvements in auth (#694)

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 5efb4a41c3a030ee2b775138992048c9d767b8ad..eb85b8c578f0ceaa5f3ff5f7465c5287f764de4c 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2708,7 +2708,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
                return 1;\r
        }\r
 \r
-       uint8_t cmd1[] = {0x0a, 0x00, 0x70, keyn[1], keyn[0], 0x00};\r
+       uint8_t cmd1[] = {0x70, keyn[1], keyn[0], 0x00};\r
        int res = ExchangeRAW14a(cmd1, sizeof(cmd1), true, true, data, sizeof(data), &datalen);\r
        if (res) {\r
                PrintAndLog("ERROR exchande raw error: %d", res);\r
@@ -2718,45 +2718,37 @@ int CmdHF14AMfAuth4(const char *cmd) {
        \r
        PrintAndLog("<phase1: %s", sprint_hex(data, datalen));\r
                \r
-       if (datalen < 3) {\r
+       if (datalen < 1) {\r
                PrintAndLog("ERROR: card response length: %d", datalen);\r
                DropField();\r
                return 3;\r
        }\r
        \r
-       if (data[0] != 0x0a || data[1] != 0x00) {\r
-               PrintAndLog("ERROR: card response. Framing error. :%s", sprint_hex(data, 2));\r
-               DropField();\r
-               return 3;\r
-       }\r
-\r
-       if (data[2] != 0x90) {\r
+       if (data[0] != 0x90) {\r
                PrintAndLog("ERROR: card response error: %02x", data[2]);\r
                DropField();\r
                return 3;\r
        }\r
 \r
-       if (datalen != 19) {\r
-               PrintAndLog("ERROR: card response must be 16 bytes long instead of: %d", datalen);\r
+       if (datalen != 19) { // code 1b + 16b + crc 2b\r
+               PrintAndLog("ERROR: card response must be 19 bytes long instead of: %d", datalen);\r
                DropField();\r
                return 3;\r
        }\r
        \r
-    aes_decode(NULL, key, &data[3], Rnd2, 16);\r
+    aes_decode(NULL, key, &data[1], Rnd2, 16);\r
        Rnd2[16] = Rnd2[0];\r
        PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));\r
 \r
-       uint8_t cmd2[35] = {0};\r
-       cmd2[0] = 0x0b;\r
-       cmd2[1] = 0x00;\r
-       cmd2[2] = 0x72;\r
+       uint8_t cmd2[33] = {0};\r
+       cmd2[0] = 0x72;\r
 \r
        uint8_t raw[32] = {0};\r
        memmove(raw, Rnd1, 16);\r
        memmove(&raw[16], &Rnd2[1], 16);\r
 \r
-    aes_encode(NULL, key, raw, &cmd2[3], 32);\r
-       PrintAndLog(">phase2: %s", sprint_hex(cmd2, 35));\r
+    aes_encode(NULL, key, raw, &cmd2[1], 32);\r
+       PrintAndLog(">phase2: %s", sprint_hex(cmd2, 33));\r
        \r
        res = ExchangeRAW14a(cmd2, sizeof(cmd2), false, false, data, sizeof(data), &datalen);\r
        if (res) {\r
@@ -2767,7 +2759,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
        \r
        PrintAndLog("<phase2: %s", sprint_hex(data, datalen));\r
 \r
-    aes_decode(NULL, key, &data[3], raw, 32);\r
+    aes_decode(NULL, key, &data[1], raw, 32);\r
        PrintAndLog("res: %s", sprint_hex(raw, 32));\r
        \r
        PrintAndLog("Rnd1`: %s", sprint_hex(&raw[4], 16));\r