CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 3ab1b5681c0a2b11804492a4d5651c266fbe4bdc..4e9ac539d40323e7e849c7b6d98a7d54eedc588b 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -15,6 +15,7 @@
 #include "mifarehost.h"\r
 #include "proxmark3.h"\r
 //#include "radixsort.h"\r
 #include "mifarehost.h"\r
 #include "proxmark3.h"\r
 //#include "radixsort.h"\r

+#include <time.h>\r

 \r
 // MIFARE\r
 int compar_int(const void * a, const void * b) {\r
 \r
 // MIFARE\r
 int compar_int(const void * a, const void * b) {\r


@@ -22,8 +23,8 @@ int compar_int(const void * a, const void * b) {
        //return (*(uint64_t*)b - *(uint64_t*)a);\r
 \r
        // better:\r
        //return (*(uint64_t*)b - *(uint64_t*)a);\r
 \r
        // better:\r

-       if (*(uint64_t*)b < *(uint64_t*)a) return -1;\r

        if (*(uint64_t*)b > *(uint64_t*)a) return 1;\r
        if (*(uint64_t*)b > *(uint64_t*)a) return 1;\r

+       if (*(uint64_t*)b < *(uint64_t*)a) return -1;   \r

        return 0;\r
 \r
        //return (*(uint64_t*)b > *(uint64_t*)a) - (*(uint64_t*)b < *(uint64_t*)a);\r
        return 0;\r
 \r
        //return (*(uint64_t*)b > *(uint64_t*)a) - (*(uint64_t*)b < *(uint64_t*)a);\r


@@ -31,12 +32,11 @@ int compar_int(const void * a, const void * b) {
 \r
 // Compare 16 Bits out of cryptostate\r
 int Compare16Bits(const void * a, const void * b) {\r
 \r
 // Compare 16 Bits out of cryptostate\r
 int Compare16Bits(const void * a, const void * b) {\r

-\r
-        if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1;\r

         if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;     \r
         if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;     \r

+        if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1;\r

         return 0;\r
 \r
         return 0;\r
 \r

-       /*return \r
+/*     return \r

                ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000))\r
                -\r
                ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000))\r
                ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000))\r
                -\r
                ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000))\r


@@ -68,15 +68,13 @@ void* nested_worker_thread(void *arg)
 {\r
        struct Crypto1State *p1;\r
        StateList_t *statelist = arg;\r
 {\r
        struct Crypto1State *p1;\r
        StateList_t *statelist = arg;\r

-\r
-       statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);\r
+       statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);       \r

        \r
        for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\r
        \r
        statelist->len = p1 - statelist->head.slhead;\r
        statelist->tail.sltail = --p1;\r
        qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r
        \r
        for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\r
        \r
        statelist->len = p1 - statelist->head.slhead;\r
        statelist->tail.sltail = --p1;\r
        qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r

-       \r

        return statelist->head.slhead;\r
 }\r
 \r
        return statelist->head.slhead;\r
 }\r
 \r


@@ -97,8 +95,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        // error during nested\r
        if (resp.arg[0]) return resp.arg[0];\r
        \r
        // error during nested\r
        if (resp.arg[0]) return resp.arg[0];\r
        \r

-//     memcpy(&uid, resp.d.asBytes, 4);\r
-       uid = bytes_to_num(resp.d.asBytes, 4);\r
+       memcpy(&uid, resp.d.asBytes, 4);\r

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


@@ -149,7 +146,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
                        while (Compare16Bits(p1, p2) == 1) p2++;\r
                }\r
        }\r
                        while (Compare16Bits(p1, p2) == 1) p2++;\r
                }\r
        }\r

-       \r
+\r

        p3->even = 0; p3->odd = 0;\r
        p4->even = 0; p4->odd = 0;\r
        statelists[0].len = p3 - statelists[0].head.slhead;\r
        p3->even = 0; p3->odd = 0;\r
        p4->even = 0; p4->odd = 0;\r
        statelists[0].len = p3 - statelists[0].head.slhead;\r


@@ -161,10 +158,11 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        // intersection of both lists. Create the intersection:\r
        qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compar_int);\r
        qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compar_int);\r
        // intersection of both lists. Create the intersection:\r
        qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compar_int);\r
        qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compar_int);\r

-\r
+       \r

        uint64_t *p5, *p6, *p7;\r
        p5 = p7 = statelists[0].head.keyhead; \r
        p6 = statelists[1].head.keyhead;\r
        uint64_t *p5, *p6, *p7;\r
        p5 = p7 = statelists[0].head.keyhead; \r
        p6 = statelists[1].head.keyhead;\r

+       \r

        while (p5 <= statelists[0].tail.keytail && p6 <= statelists[1].tail.keytail) {\r
                if (compar_int(p5, p6) == 0) {\r
                        *p7++ = *p5++;\r
        while (p5 <= statelists[0].tail.keytail && p6 <= statelists[1].tail.keytail) {\r
                if (compar_int(p5, p6) == 0) {\r
                        *p7++ = *p5++;\r


@@ -178,17 +176,15 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        statelists[0].len = p7 - statelists[0].head.keyhead;\r
        statelists[0].tail.keytail = --p7;\r
 \r
        statelists[0].len = p7 - statelists[0].head.keyhead;\r
        statelists[0].tail.keytail = --p7;\r
 \r

+       uint32_t numOfCandidates = statelists[0].len;\r
+       if ( numOfCandidates == 0 ) goto out;\r
+       \r

        memset(resultKey, 0, 6);\r
        uint64_t key64 = 0;\r
 \r
        // The list may still contain several key candidates. Test each of them with mfCheckKeys\r
        // uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r
        memset(resultKey, 0, 6);\r
        uint64_t key64 = 0;\r
 \r
        // The list may still contain several key candidates. Test each of them with mfCheckKeys\r
        // uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r

-\r
-       uint32_t numOfCandidates = statelists[0].len;\r
-       if ( numOfCandidates == 0 ) goto out;\r
-\r
-       uint8_t *keyBlock = malloc(numOfCandidates*6);\r
-       if (keyBlock == NULL) return -6;\r
+       uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};\r

 \r
        for (i = 0; i < numOfCandidates; ++i){\r
                crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
 \r
        for (i = 0; i < numOfCandidates; ++i){\r
                crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r


@@ -198,7 +194,6 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, numOfCandidates, keyBlock, &key64)) {             \r
                free(statelists[0].head.slhead);\r
                free(statelists[1].head.slhead);\r
        if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, numOfCandidates, keyBlock, &key64)) {             \r
                free(statelists[0].head.slhead);\r
                free(statelists[1].head.slhead);\r

-               free(keyBlock);\r

                num_to_bytes(key64, 6, resultKey);\r
 \r
                PrintAndLog("UID: %08x target block:%3u key type: %c  -- Found key [%012"llx"]",\r
                num_to_bytes(key64, 6, resultKey);\r
 \r
                PrintAndLog("UID: %08x target block:%3u key type: %c  -- Found key [%012"llx"]",\r


@@ -209,10 +204,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
                );\r
                return -5;\r
        }\r
                );\r
                return -5;\r
        }\r

-\r
+       \r

 out:\r
        PrintAndLog("UID: %08x target block:%3u key type: %c",\r
 out:\r
        PrintAndLog("UID: %08x target block:%3u key type: %c",\r

-                       uid,\r
+                       uid,\r

                        (uint16_t)resp.arg[2] & 0xff,\r
                        (resp.arg[2] >> 8) ? 'B' : 'A'\r
        );      \r
                        (uint16_t)resp.arg[2] & 0xff,\r
                        (resp.arg[2] >> 8) ? 'B' : 'A'\r
        );      \r


@@ -230,7 +225,7 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t key
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r

-       if (!WaitForResponseTimeout(CMD_ACK,&resp, 3000)) return 1;\r
+       if (!WaitForResponseTimeout(CMD_ACK,&resp, 2500)) return 1;\r

        if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
        *key = bytes_to_num(resp.d.asBytes, 6);\r
        return 0;\r
        if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
        *key = bytes_to_num(resp.d.asBytes, 6);\r
        return 0;\r