Mfp commands (#698)

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index eb85b8c578f0ceaa5f3ff5f7465c5287f764de4c..83180e7d096975cc8d0a41a4b12ddbac9368bc2f 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -29,7 +29,7 @@
 #include "hardnested/hardnested_bf_core.h"\r
 #include "cliparser/cliparser.h"\r
 #include "cmdhf14a.h"\r
 #include "hardnested/hardnested_bf_core.h"\r
 #include "cliparser/cliparser.h"\r
 #include "cmdhf14a.h"\r

-#include <polarssl/aes.h>\r
+#include "mifare4.h"\r

 \r
 #define NESTED_SECTOR_RETRY     10                     // how often we try mfested() until we give up\r
 \r
 \r
 #define NESTED_SECTOR_RETRY     10                     // how often we try mfested() until we give up\r
 \r


@@ -2637,50 +2637,12 @@ int CmdDecryptTraceCmds(const char *Cmd){
        return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r
 }\r
 \r
        return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r
 }\r
 \r

-int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){\r
-       uint8_t iiv[16] = {0};\r
-       if (iv)\r
-               memcpy(iiv, iv, 16);\r
-       \r
-       aes_context aes;\r
-       aes_init(&aes);\r
-       if (aes_setkey_enc(&aes, key, 128))\r
-               return 1;\r
-       if (aes_crypt_cbc(&aes, AES_ENCRYPT, length, iiv, input, output))\r
-               return 2;\r
-       aes_free(&aes);\r
-\r
-       return 0;\r
-}\r
-\r
-int aes_decode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length){\r
-       uint8_t iiv[16] = {0};\r
-       if (iv)\r
-               memcpy(iiv, iv, 16);\r
-       \r
-       aes_context aes;\r
-       aes_init(&aes);\r
-       if (aes_setkey_dec(&aes, key, 128))\r
-               return 1;\r
-       if (aes_crypt_cbc(&aes, AES_DECRYPT, length, iiv, input, output))\r
-               return 2;\r
-       aes_free(&aes);\r
-\r
-       return 0;\r
-}\r
-\r

 int CmdHF14AMfAuth4(const char *cmd) {\r
        uint8_t keyn[20] = {0};\r
        int keynlen = 0;\r
        uint8_t key[16] = {0};\r
        int keylen = 0;\r
 int CmdHF14AMfAuth4(const char *cmd) {\r
        uint8_t keyn[20] = {0};\r
        int keynlen = 0;\r
        uint8_t key[16] = {0};\r
        int keylen = 0;\r

-       uint8_t data[257] = {0};\r
-       int datalen = 0;\r
-       \r
-       uint8_t Rnd1[17] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00};\r
-       uint8_t Rnd2[17] = {0};\r
-       \r
-       \r
+\r

        CLIParserInit("hf mf auth4", \r
                "Executes AES authentication command in ISO14443-4", \r
                "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"\r
        CLIParserInit("hf mf auth4", \r
                "Executes AES authentication command in ISO14443-4", \r
                "Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"\r


@@ -2694,8 +2656,8 @@ int CmdHF14AMfAuth4(const char *cmd) {
        };\r
        CLIExecWithReturn(cmd, argtable, true);\r
        \r
        };\r
        CLIExecWithReturn(cmd, argtable, true);\r
        \r

-       CLIGetStrWithReturn(1, keyn, &keynlen);\r
-       CLIGetStrWithReturn(2, key, &keylen);\r
+       CLIGetHexWithReturn(1, keyn, &keynlen);\r
+       CLIGetHexWithReturn(2, key, &keylen);\r

        CLIParserFree();\r
        \r
        if (keynlen != 2) {\r
        CLIParserFree();\r
        \r
        if (keynlen != 2) {\r


@@ -2708,73 +2670,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
                return 1;\r
        }\r
 \r
                return 1;\r
        }\r
 \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
-               DropField();\r
-               return 2;\r
-       }\r
-       \r
-       PrintAndLog("<phase1: %s", sprint_hex(data, datalen));\r
-               \r
-       if (datalen < 1) {\r
-               PrintAndLog("ERROR: card response length: %d", datalen);\r
-               DropField();\r
-               return 3;\r
-       }\r
-       \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) { // 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[1], Rnd2, 16);\r
-       Rnd2[16] = Rnd2[0];\r
-       PrintAndLog("Rnd2: %s", sprint_hex(Rnd2, 16));\r
-\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[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
-               PrintAndLog("ERROR exchande raw error: %d", res);\r
-               DropField();\r
-               return 4;\r
-       }\r
-       \r
-       PrintAndLog("<phase2: %s", sprint_hex(data, datalen));\r
-\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
-       if (memcmp(&raw[4], &Rnd1[1], 16)) {\r
-               PrintAndLog("\nERROR: Authentication FAILED. rnd not equal");\r
-               PrintAndLog("rnd1 reader: %s", sprint_hex(&Rnd1[1], 16));\r
-               PrintAndLog("rnd1   card: %s", sprint_hex(&raw[4], 16));\r
-               DropField();\r
-               return 5;\r
-       }\r
-\r
-       DropField();\r
-       PrintAndLog("\nAuthentication OK");\r
-       \r
-       return 0;\r
+       return MifareAuth4(NULL, keyn, key, true, false, true);\r

 }\r
 \r
 static command_t CommandTable[] =\r
 }\r
 \r
 static command_t CommandTable[] =\r