replace msleep() by thread signalling in comms.c

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 647305e8aa0150cdf9e0b46f51ed24e4e6d08da5..93df109c8c264a86a247edf65f2f1d9d0d807d43 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -22,6 +22,7 @@
 #include "iso14443a.h"\r
 #include "crapto1/crapto1.h"\r
 #include "mbedtls/des.h"\r
 #include "iso14443a.h"\r
 #include "crapto1/crapto1.h"\r
 #include "mbedtls/des.h"\r

+#include "protocols.h"\r

 \r
 int MF_DBGLEVEL = MF_DBG_INFO;\r
 \r
 \r
 int MF_DBGLEVEL = MF_DBG_INFO;\r
 \r


@@ -112,9 +113,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }\r
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }\r

-\r

                ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r
                ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r

-\r

        } else {\r
                ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        }\r
        } else {\r
                ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        }\r


@@ -142,18 +141,18 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
        return len;\r
 }\r
 \r
        return len;\r
 }\r
 \r

+\r

 // mifare classic commands\r
 // mifare classic commands\r

-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested)\r
-{\r
-       return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);\r
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout) {\r
+\r
+       return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL, auth_timeout);\r

 }\r
 \r
 }\r
 \r

-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing)\r
-{\r
-       // variables\r
+\r
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing, uint32_t *auth_timeout) {\r
+\r

        int len;\r
        uint32_t pos;\r
        int len;\r
        uint32_t pos;\r

-       uint8_t tmp4[4];\r

        uint8_t par[1] = {0x00};\r
        byte_t nr[4];\r
        uint32_t nt, ntpp; // Supplied tag nonce\r
        uint8_t par[1] = {0x00};\r
        byte_t nr[4];\r
        uint32_t nt, ntpp; // Supplied tag nonce\r


@@ -163,7 +162,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // Transmit MIFARE_CLASSIC_AUTH\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // Transmit MIFARE_CLASSIC_AUTH\r

-       len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);\r
+       len = mifare_sendcmd_short(pcs, isNested, keyType & 0x01 ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, blockNo, receivedAnswer, receivedAnswerPar, timing);\r

        if (MF_DBGLEVEL >= 4)   Dbprintf("rand tag nonce len: %x", len);\r
        if (len != 4) return 1;\r
 \r
        if (MF_DBGLEVEL >= 4)   Dbprintf("rand tag nonce len: %x", len);\r
        if (len != 4) return 1;\r
 \r


@@ -201,8 +200,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
        par[0] = 0;\r
 \r
        // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
        par[0] = 0;\r

-       for (pos = 0; pos < 4; pos++)\r
-       {\r
+       for (pos = 0; pos < 4; pos++) {\r

                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r
        }\r
                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r
        }\r


@@ -211,8 +209,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        nt = prng_successor(nt,32);\r
 \r
        //  ar+parity\r
        nt = prng_successor(nt,32);\r
 \r
        //  ar+parity\r

-       for (pos = 4; pos < 8; pos++)\r
-       {\r
+       for (pos = 4; pos < 8; pos++) {\r

                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r
                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r


@@ -222,17 +219,24 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);\r
 \r
        // Receive 4 byte tag answer\r
        ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);\r
 \r
        // Receive 4 byte tag answer\r

+       uint32_t save_timeout = iso14a_get_timeout(); // save standard timeout\r
+       if (auth_timeout && *auth_timeout) {\r
+               iso14a_set_timeout(*auth_timeout);        // set timeout for authentication response\r
+       }\r
+       uint32_t auth_timeout_start = GetCountSspClk();\r

        len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r
        len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

-       if (!len)\r
-       {\r
+       iso14a_set_timeout(save_timeout);             // restore standard timeout\r
+       if (!len) {\r

                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
                return 2;\r
        }\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
                return 2;\r
        }\r

+       if (auth_timeout && !*auth_timeout) {         // measure time for future authentication response timeout\r
+               *auth_timeout = (GetCountSspClk() - auth_timeout_start - (len * 9 + 2) * 8) / 8 + 1;\r
+       }\r

 \r
 \r

-       memcpy(tmp4, receivedAnswer, 4);\r
-       ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
+       ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0, 0);\r

 \r
 \r

-       if (ntpp != bytes_to_num(tmp4, 4)) {\r
+       if (ntpp != bytes_to_num(receivedAnswer, 4)) {\r

                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
                return 3;\r
        }\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
                return 3;\r
        }\r


@@ -240,8 +244,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)\r
-{\r
+\r
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {\r

        // variables\r
        int len;\r
        uint8_t bt[2];\r
        // variables\r
        int len;\r
        uint8_t bt[2];\r


@@ -250,7 +254,7 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // command MIFARE_CLASSIC_READBLOCK\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // command MIFARE_CLASSIC_READBLOCK\r

-       len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

        if (len == 1) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
                return 1;\r
        if (len == 1) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
                return 1;\r


@@ -282,7 +286,7 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

-       len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r
+       len = mifare_sendcmd(MIFARE_ULEV1_AUTH, key, sizeof(key), resp, respPar, NULL);\r

        //len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r
        if (len != 4) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r
        //len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r
        if (len != 4) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r


@@ -314,7 +318,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        uint8_t respPar[3] = {0,0,0};\r
 \r
        // REQUEST AUTHENTICATION\r
        uint8_t respPar[3] = {0,0,0};\r
 \r
        // REQUEST AUTHENTICATION\r

-       len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);\r
+       len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);\r

        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
                return 0;\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
                return 0;\r


@@ -364,7 +368,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
                );\r
 \r
        //len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r
                );\r
 \r
        //len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r

-       len = mifare_sendcmd(0xAF, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);\r
+       len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);\r

        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
                return 0;\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
                return 0;\r


@@ -421,7 +425,7 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
        int result = 0;\r
 \r
        for (retries = 0; retries < MFU_MAX_RETRIES; retries++) {\r
        int result = 0;\r
 \r
        for (retries = 0; retries < MFU_MAX_RETRIES; retries++) {\r

-               len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+               len = mifare_sendcmd_short(NULL, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

                if (len == 1) {\r
                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
                        result = 1;\r
                if (len == 1) {\r
                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
                        result = 1;\r


@@ -468,7 +472,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r

-       len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

 \r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
 \r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r


@@ -511,7 +515,7 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
        uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
 \r
        uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
 \r

-       len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(NULL, true, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

 \r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
 \r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r


@@ -563,7 +567,7 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r

-       len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r

        if (len != 0) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("halt error. response len: %x", len);\r
        if (len != 0) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("halt error. response len: %x", len);\r


@@ -579,7 +583,7 @@ int mifare_ultra_halt()
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r

-       len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r

        if (len != 0) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("halt error. response len: %x", len);\r
        if (len != 0) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("halt error. response len: %x", len);\r


@@ -810,7 +814,7 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 //\r
 //-----------------------------------------------------------------------------\r
 // one key check\r
 //\r
 //-----------------------------------------------------------------------------\r
 // one key check\r

-int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r

 \r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
 \r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r


@@ -819,7 +823,7 @@ int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uin
        // Iceman: use piwi's faster nonce collecting part in hardnested.\r
        if (*cascade_levels == 0) { // need a full select cycle to get the uid first\r
                iso14a_card_select_t card_info;\r
        // Iceman: use piwi's faster nonce collecting part in hardnested.\r
        if (*cascade_levels == 0) { // need a full select cycle to get the uid first\r
                iso14a_card_select_t card_info;\r

-               if(!iso14443a_select_card(uid, &card_info, cuid, true, 0, true)) {\r
+               if (!iso14443a_select_card(uid, &card_info, cuid, true, 0, true)) {\r

                        if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card");\r
                        return  1;\r
                }\r
                        if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card");\r
                        return  1;\r
                }\r


@@ -830,32 +834,25 @@ int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uin
                        default: break;\r
                }\r
        } else { // no need for anticollision. We can directly select the card\r
                        default: break;\r
                }\r
        } else { // no need for anticollision. We can directly select the card\r

-               if(!iso14443a_select_card(uid, NULL, NULL, false, *cascade_levels, true)) {\r
+               if (!iso14443a_select_card(uid, NULL, NULL, false, *cascade_levels, true)) {\r

                        if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);\r
                        return  1;\r
                }\r
        }\r
 \r
                        if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);\r
                        return  1;\r
                }\r
        }\r
 \r

-       if(mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-//      SpinDelayUs(AUTHENTICATION_TIMEOUT); // it not needs because mifare_classic_auth have timeout from iso14a_set_timeout()\r
+       if (mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST, auth_timeout)) { // authentication failed\r

                return 2;\r
        } else {\r
                return 2;\r
        } else {\r

-/*      // let it be here. it like halt command, but maybe it will work in some strange cases\r
-               uint8_t dummy_answer = 0;\r
-               ReaderTransmit(&dummy_answer, 1, NULL);\r
-               int timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
-               // wait for the card to become ready again\r
-               while(GetCountSspClk() < timeout) {};\r
-*/\r
-               // it needs after success authentication\r

                mifare_classic_halt(pcs, *cuid);\r
        }\r
 \r
        return 0;\r
 }\r
 \r
                mifare_classic_halt(pcs, *cuid);\r
        }\r
 \r
        return 0;\r
 }\r
 \r

+\r

 // multi key check\r
 // multi key check\r

-int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r
+\r

        uint8_t uid[10];\r
        uint32_t cuid = 0;\r
        uint8_t cascade_levels = 0;\r
        uint8_t uid[10];\r
        uint32_t cuid = 0;\r
        uint8_t cascade_levels = 0;\r


@@ -864,14 +861,8 @@ int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t
        int retryCount = 0;\r
        for (uint8_t i = 0; i < keyCount; i++) {\r
 \r
        int retryCount = 0;\r
        for (uint8_t i = 0; i < keyCount; i++) {\r
 \r

-               // Allow button press / usb cmd to interrupt device\r
-               if (BUTTON_PRESS() && !usb_poll_validate_length()) {\r
-                       Dbprintf("ChkKeys: Cancel operation. Exit...");\r
-                       return -2;\r
-               }\r
-\r

                ui64Key = bytes_to_num(keys + i * 6, 6);\r
                ui64Key = bytes_to_num(keys + i * 6, 6);\r

-               int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, debugLevel);\r
+               int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, auth_timeout, debugLevel);\r

 \r
                // can't select\r
                if (res == 1) {\r
 \r
                // can't select\r
                if (res == 1) {\r


@@ -893,14 +884,20 @@ int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t
                        continue; // can't auth. wrong key.\r
                }\r
 \r
                        continue; // can't auth. wrong key.\r
                }\r
 \r

+               // successful authentication\r

                return i + 1;\r
        }\r
 \r
                return i + 1;\r
        }\r
 \r

+       if (BUTTON_PRESS()) {\r
+               return -2;\r
+       }\r
+\r

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

+\r

 // multisector multikey check\r
 // multisector multikey check\r

-int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex) {\r
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, TKeyIndex *keyIndex) {\r

        int res = 0;\r
 \r
 //  int clk = GetCountSspClk();\r
        int res = 0;\r
 \r
 //  int clk = GetCountSspClk();\r


@@ -910,11 +907,11 @@ int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, u
 \r
                int keyAB = keyType;\r
                do {\r
 \r
                int keyAB = keyType;\r
                do {\r

-                       res = MifareChkBlockKeys(keys, keyCount, FirstBlockOfSector(sc), keyAB & 0x01, debugLevel);\r
-                       if (res < 0){\r
+                       res = MifareChkBlockKeys(keys, keyCount, FirstBlockOfSector(sc), keyAB & 0x01, auth_timeout, debugLevel);\r
+                       if (res < 0) {\r

                                return res;\r
                        }\r
                                return res;\r
                        }\r

-                       if (res > 0){\r
+                       if (res > 0) {\r

                                (*keyIndex)[keyAB & 0x01][sc] = res;\r
                        }\r
                } while(--keyAB > 0);\r
                                (*keyIndex)[keyAB & 0x01][sc] = res;\r
                        }\r
                } while(--keyAB > 0);\r


@@ -922,7 +919,7 @@ int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, u
 \r
 //  Dbprintf("%d %d", GetCountSspClk() - clk, (GetCountSspClk() - clk)/(SectorCount*keyCount*(keyType==2?2:1)));\r
 \r
 \r
 //  Dbprintf("%d %d", GetCountSspClk() - clk, (GetCountSspClk() - clk)/(SectorCount*keyCount*(keyType==2?2:1)));\r
 \r

-       return 0;\r
+       return 1;\r

 }\r
 \r
 \r
 }\r
 \r
 \r