ADD: ISO7816-4 annotation in "hf list".

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index d754b06b4a1a01dd589c6523bc354fdd0c99566d..6acd22f8cb0e0cdaa287b3f0023b6256b4ff9e27 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -71,9 +71,10 @@ void* nested_worker_thread(void *arg)
 \r
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) \r
 {\r
 \r
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) \r
 {\r

-       uint16_t i, len;\r
+       uint16_t i;\r

        uint32_t uid;\r
        UsbCommand resp;\r
        uint32_t uid;\r
        UsbCommand resp;\r

+\r

        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r
        \r
        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r
        \r


@@ -84,26 +85,24 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        memcpy(c.d.asBytes, key, 6);\r
        SendCommand(&c);\r
 \r
        memcpy(c.d.asBytes, key, 6);\r
        SendCommand(&c);\r
 \r

-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
-               len = resp.arg[1];\r
-               if (len == 2) { \r
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+               return -1;\r
+       }\r
+\r
+       if (resp.arg[0]) {\r
+               return resp.arg[0];  // error during nested\r
+       }\r
+               \r

                        memcpy(&uid, resp.d.asBytes, 4);\r
                        memcpy(&uid, resp.d.asBytes, 4);\r

-                       PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r
+       PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r

                        \r
                        for (i = 0; i < 2; i++) {\r
                                statelists[i].blockNo = resp.arg[2] & 0xff;\r
                                statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
                                statelists[i].uid = uid;\r
                        \r
                        for (i = 0; i < 2; i++) {\r
                                statelists[i].blockNo = resp.arg[2] & 0xff;\r
                                statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
                                statelists[i].uid = uid;\r

-\r

                                memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
                                memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
                        }\r
                                memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
                                memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
                        }\r

-               }\r
-               else {\r
-                       PrintAndLog("Got 0 keys from proxmark."); \r
-                       return 1;\r
-               }\r
-       }\r

        \r
        // calc keys\r
        \r
        \r
        // calc keys\r
        \r


@@ -184,7 +183,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
                crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
                num_to_bytes(key64, 6, keyBlock);\r
                key64 = 0;\r
                crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
                num_to_bytes(key64, 6, keyBlock);\r
                key64 = 0;\r

-               if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, 1, keyBlock, &key64)) {\r
+               if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, 1, keyBlock, &key64)) {\r

                        num_to_bytes(key64, 6, resultKey);\r
                        break;\r
                }\r
                        num_to_bytes(key64, 6, resultKey);\r
                        break;\r
                }\r


@@ -196,11 +195,11 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r

 \r
        *key = 0;\r
 \r
 \r
        *key = 0;\r
 \r

-       UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r
+       UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r

        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
        SendCommand(&c);\r
 \r
        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
        SendCommand(&c);\r
 \r