small improvements in auth (#694)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index a5de2e2a9341724f500533d05e0ba7ab43c02392..63b1cda6f01da0ec07a628da44879f660e13ccdc 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -649,10 +649,12 @@ void DropField() {
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+       static bool responseNum = false;
        uint16_t cmdc = 0;
        *dataoutlen = 0;
        
        if (activateField) {
+               responseNum = false;
                UsbCommand resp;
 
                // Anticollision + SELECT card
@@ -695,8 +697,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
        if (leaveSignalON)
                cmdc |= ISO14A_NO_DISCONNECT;
 
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; 
-       memcpy(c.d.asBytes, datain, datainlen);
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+       uint8_t header[] = {0x0a | responseNum, 0x00};
+       responseNum ^= 1;
+       memcpy(c.d.asBytes, header, 2);
+       memcpy(&c.d.asBytes[2], datain, datainlen);
        SendCommand(&c);
        
     uint8_t *recv;
@@ -715,7 +720,12 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
                        return 2;
                }
                
-               memcpy(dataout, recv, *dataoutlen);
+               if (recv[0] != header[0]) {
+                       PrintAndLog("14aRAW ERROR: iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+                       return 2;
+               }
+               
+               memcpy(dataout, &recv[2], *dataoutlen);
                
         if(!iLen) {
                        PrintAndLog("14aRAW ERROR: No card response.");

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