Update README.md

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 89afe06a42f8a626df3b564d21e16d13826eb2f1..15db8f1181363ec81c759f5c332b688ae5b058d2 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -18,7 +18,7 @@
 #include <stdint.h>\r
 \r
 #include "proxmark3.h"\r
 #include <stdint.h>\r
 \r
 #include "proxmark3.h"\r

-#include "cmd.h"\r
+#include "usb_cdc.h"\r

 #include "crapto1/crapto1.h"\r
 #include "iso14443a.h"\r
 #include "BigBuf.h"\r
 #include "crapto1/crapto1.h"\r
 #include "iso14443a.h"\r
 #include "BigBuf.h"\r


@@ -87,7 +87,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        break;\r
                };\r
 \r
                        break;\r
                };\r
 \r

-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\r

                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r


@@ -111,11 +111,12 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
 \r

+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
        LED_B_OFF();\r
 \r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -202,9 +203,10 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
                return;\r
        }\r
 \r
                return;\r
        }\r
 \r

-       cmd_send(CMD_ACK,1,0,0,dataout,16);\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LED_D_OFF();\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LED_D_OFF();\r

+\r
+       cmd_send(CMD_ACK,1,0,0,dataout,16);\r

        LED_A_OFF();\r
 }\r
 \r
        LED_A_OFF();\r
 }\r
 \r


@@ -244,7 +246,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        }\r
 \r
 \r
        }\r
 \r
 \r

-       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
+       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\r

                isOK = 0;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
        }\r
                isOK = 0;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
        }\r


@@ -266,12 +268,13 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
 \r

+       // Thats it...\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));\r
        LED_B_OFF();\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));\r
        LED_B_OFF();\r
 \r

-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -362,10 +365,11 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Blocks read %d", countblocks);\r
 \r
 \r
        if (MF_DBGLEVEL >= MF_DBG_DEBUG) Dbprintf("Blocks read %d", countblocks);\r
 \r

-       cmd_send(CMD_ACK, 1, countblocks*4, BigBuf_max_traceLen(), 0, 0);\r
-\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LED_D_OFF();\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LED_D_OFF();\r

+\r
+       cmd_send(CMD_ACK, 1, countblocks*4, BigBuf_max_traceLen(), 0, 0);\r
+\r

        BigBuf_free();\r
        LED_A_OFF();\r
 }\r
        BigBuf_free();\r
        LED_A_OFF();\r
 }\r


@@ -407,7 +411,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                        break;\r
                };\r
 \r
                        break;\r
                };\r
 \r

-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\r

                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                };\r


@@ -431,13 +435,14 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r

+       // Thats it...\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        LED_B_OFF();\r
 \r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        LED_B_OFF();\r
 \r
 \r

-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -475,8 +480,9 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r

-       cmd_send(CMD_ACK,1,0,0,0,0);\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r

        LEDsoff();\r
 }\r
 */\r
        LEDsoff();\r
 }\r
 */\r


@@ -544,8 +550,9 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 \r
        if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r
 \r

-       cmd_send(CMD_ACK,1,0,0,0,0);\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -613,8 +620,9 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
                return;\r
        };\r
 \r
                return;\r
        };\r
 \r

-       cmd_send(CMD_ACK,1,0,0,0,0);\r

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -632,8 +640,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r

-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
-{\r
+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {\r

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


@@ -658,7 +665,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        bool field_off = flags & 0x0004;\r
 \r
        LED_A_ON();\r
        bool field_off = flags & 0x0004;\r
 \r
        LED_A_ON();\r

-       LED_C_OFF();\r

 \r
        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r


@@ -666,8 +672,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                set_tracing(true);\r
        }\r
 \r
                set_tracing(true);\r
        }\r
 \r

-       LED_C_ON();\r
-\r

        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r
        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r


@@ -705,7 +709,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                }\r
 \r
                uint32_t nt1;\r
                }\r
 \r
                uint32_t nt1;\r

-               if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {\r
+               if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL, NULL)) {\r

                        if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth1 error");\r
                        continue;\r
                }\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth1 error");\r
                        continue;\r
                }\r


@@ -739,20 +743,18 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 \r
        }\r
 \r
 \r
        }\r
 \r

-       LED_C_OFF();\r
-\r

        crypto1_destroy(pcs);\r
 \r
        crypto1_destroy(pcs);\r
 \r

-       LED_B_ON();\r
-       cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
-       LED_B_OFF();\r
-\r
-       if (MF_DBGLEVEL >= 3)   DbpString("AcquireEncryptedNonces finished");\r
-\r

        if (field_off) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        if (field_off) {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

-               LEDsoff();\r
+               LED_D_OFF();\r

        }\r
        }\r

+\r
+       if (MF_DBGLEVEL >= 3)   DbpString("AcquireEncryptedNonces finished");\r
+\r
+       cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
+\r
+       LED_A_OFF();\r

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


@@ -760,9 +762,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 // MIFARE nested authentication.\r
 //\r
 //-----------------------------------------------------------------------------\r
 // MIFARE nested authentication.\r
 //\r
 //-----------------------------------------------------------------------------\r

-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r
-{\r
-       // params\r
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) {\r
+\r

        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        uint8_t targetBlockNo = arg1 & 0xff;\r
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        uint8_t targetBlockNo = arg1 & 0xff;\r


@@ -771,14 +772,14 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        ui64Key = bytes_to_num(datain, 6);\r
 \r
 \r
        ui64Key = bytes_to_num(datain, 6);\r
 \r

-       // variables\r

        uint16_t rtr, i, j, len;\r
        uint16_t davg;\r
        static uint16_t dmin, dmax;\r
        uint8_t uid[10];\r
        uint16_t rtr, i, j, len;\r
        uint16_t davg;\r
        static uint16_t dmin, dmax;\r
        uint8_t uid[10];\r

-       uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r
+       uint32_t cuid, nt1, nt2_enc, nttmp, nttest, ks1;\r

        uint8_t par[1];\r
        uint32_t target_nt[2], target_ks[2];\r
        uint8_t par[1];\r
        uint32_t target_nt[2], target_ks[2];\r

+       uint32_t fixed_nt = 0;\r

        uint8_t target_nt_duplicate_count = 0;\r
 \r
        uint8_t par_array[4];\r
        uint8_t target_nt_duplicate_count = 0;\r
 \r
        uint8_t par_array[4];\r


@@ -788,11 +789,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        pcs = &mpcs;\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
 \r
        pcs = &mpcs;\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
 \r

-       uint32_t auth1_time, auth2_time;\r
+       uint32_t auth1_time, auth2_time, authentication_timeout = 0;\r

        static uint16_t delta_time;\r
 \r
        LED_A_ON();\r
        static uint16_t delta_time;\r
 \r
        LED_A_ON();\r

-       LED_C_OFF();\r

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r


@@ -806,7 +806,6 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        #define NESTED_MAX_TRIES 12\r
        uint16_t unsuccessfull_tries = 0;\r
        if (calibrate) {    // for first call only. Otherwise reuse previous calibration\r
        #define NESTED_MAX_TRIES 12\r
        uint16_t unsuccessfull_tries = 0;\r
        if (calibrate) {    // for first call only. Otherwise reuse previous calibration\r

-               LED_B_ON();\r

                WDT_HIT();\r
 \r
                davg = dmax = 0;\r
                WDT_HIT();\r
 \r
                davg = dmax = 0;\r


@@ -816,37 +815,38 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                        // prepare next select. No need to power down the card.\r
                for (rtr = 0; rtr < 17; rtr++) {\r
 \r
                        // prepare next select. No need to power down the card.\r

-                       if(mifare_classic_halt(pcs, cuid)) {\r
+                       if (mifare_classic_halt(pcs, cuid)) {\r

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                rtr--;\r
                                continue;\r
                        }\r
 \r
                        // Test if the action was cancelled\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                rtr--;\r
                                continue;\r
                        }\r
 \r
                        // Test if the action was cancelled\r

-                       if(BUTTON_PRESS()) {\r
+                       if (BUTTON_PRESS()) {\r

                                isOK = -2;\r
                                break;\r
                        }\r
 \r
                                isOK = -2;\r
                                break;\r
                        }\r
 \r

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

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                rtr--;\r
                                continue;\r
                        };\r
 \r
                        auth1_time = 0;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                rtr--;\r
                                continue;\r
                        };\r
 \r
                        auth1_time = 0;\r

-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time, NULL)) {\r

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
                                rtr--;\r
                                continue;\r
                        };\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
                                rtr--;\r
                                continue;\r
                        };\r

+                       fixed_nt = nt1;\r

 \r
                        if (delta_time) {\r
                                auth2_time = auth1_time + delta_time;\r
                        } else {\r
                                auth2_time = 0;\r
                        }\r
 \r
                        if (delta_time) {\r
                                auth2_time = auth1_time + delta_time;\r
                        } else {\r
                                auth2_time = 0;\r
                        }\r

-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2_enc, &auth2_time, NULL)) {\r

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
                                rtr--;\r
                                continue;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
                                rtr--;\r
                                continue;\r


@@ -855,7 +855,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        nttmp = prng_successor(nt1, 100);               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
                        for (i = 101; i < 1200; i++) {\r
                                nttmp = prng_successor(nttmp, 1);\r
                        nttmp = prng_successor(nt1, 100);               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
                        for (i = 101; i < 1200; i++) {\r
                                nttmp = prng_successor(nttmp, 1);\r

-                               if (nttmp == nt2) break;\r
+                               if (nttmp == nt2_enc) break;\r

                        }\r
 \r
                        if (i != 1200) {\r
                        }\r
 \r
                        if (i != 1200) {\r


@@ -883,39 +883,36 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                dmin = davg - 2;\r
                dmax = davg + 2;\r
 \r
                dmin = davg - 2;\r
                dmax = davg + 2;\r
 \r

-               LED_B_OFF();\r
-\r

        }\r
        //  -------------------------------------------------------------------------------------------------\r
 \r
        }\r
        //  -------------------------------------------------------------------------------------------------\r
 \r

-       LED_C_ON();\r
-\r

        //  get crypted nonces for target sector\r
        //  get crypted nonces for target sector\r

-       for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r
+       for (i = 0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

 \r
                target_nt[i] = 0;\r
 \r
                target_nt[i] = 0;\r

-               while(target_nt[i] == 0 && !isOK) { // continue until we have an unambiguous nonce\r
+               while (target_nt[i] == 0 && !isOK) { // continue until we have an unambiguous nonce\r

 \r
                        // prepare next select. No need to power down the card.\r
 \r
                        // prepare next select. No need to power down the card.\r

-                       if(mifare_classic_halt(pcs, cuid)) {\r
+                       if (mifare_classic_halt(pcs, cuid)) {\r

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                continue;\r
                        }\r
 \r
                        // break out of the loop on button press\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
                                continue;\r
                        }\r
 \r
                        // break out of the loop on button press\r

-                       if(BUTTON_PRESS()) {\r
+                       if (BUTTON_PRESS()) {\r

                                isOK = -2;\r
                                break;\r
                        }\r
 \r
                                isOK = -2;\r
                                break;\r
                        }\r
 \r

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

                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\r
                        }\r
 \r
                        auth1_time = 0;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\r
                        }\r
 \r
                        auth1_time = 0;\r

-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
+                       authentication_timeout = 0;\r
+                       if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time, &authentication_timeout)) {\r
+                               if (MF_DBGLEVEL >= 1)  Dbprintf("Nested: Auth1 error");\r

                                continue;\r
                        }\r
 \r
                                continue;\r
                        }\r
 \r


@@ -927,8 +924,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                continue;\r
                        }\r
 \r
                                continue;\r
                        }\r
 \r

-                       nt2 = bytes_to_num(receivedAnswer, 4);\r
-                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);\r
+                       nt2_enc = bytes_to_num(receivedAnswer, 4);\r
+                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2_enc, par[0]);\r

 \r
                        // Parity validity check\r
                        for (j = 0; j < 4; j++) {\r
 \r
                        // Parity validity check\r
                        for (j = 0; j < 4; j++) {\r


@@ -939,9 +936,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        nttest = prng_successor(nt1, dmin - 1);\r
                        for (j = dmin; j < dmax + 1; j++) {\r
                                nttest = prng_successor(nttest, 1);\r
                        nttest = prng_successor(nt1, dmin - 1);\r
                        for (j = dmin; j < dmax + 1; j++) {\r
                                nttest = prng_successor(nttest, 1);\r

-                               ks1 = nt2 ^ nttest;\r
+                               ks1 = nt2_enc ^ nttest;\r

 \r
 \r

-                               if (valid_nonce(nttest, nt2, ks1, par_array)){\r
+                               if (valid_nonce(nttest, nt2_enc, ks1, par_array)){\r

                                        if (ncount > 0) {       // we are only interested in disambiguous nonces, try again\r
                                                if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r
                                                target_nt[i] = 0;\r
                                        if (ncount > 0) {       // we are only interested in disambiguous nonces, try again\r
                                                if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r
                                                target_nt[i] = 0;\r


@@ -967,71 +964,78 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       LED_C_OFF();\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LED_D_OFF();\r

 \r
 \r

-       //  ----------------------------- crypto1 destroy\r

        crypto1_destroy(pcs);\r
 \r
        crypto1_destroy(pcs);\r
 \r

-       byte_t buf[4 + 4 * 4];\r
+       uint8_t buf[4 + 4 * 4 + 4 + 4];\r

        memcpy(buf, &cuid, 4);\r
        memcpy(buf+4, &target_nt[0], 4);\r
        memcpy(buf+8, &target_ks[0], 4);\r
        memcpy(buf+12, &target_nt[1], 4);\r
        memcpy(buf+16, &target_ks[1], 4);\r
        memcpy(buf, &cuid, 4);\r
        memcpy(buf+4, &target_nt[0], 4);\r
        memcpy(buf+8, &target_ks[0], 4);\r
        memcpy(buf+12, &target_nt[1], 4);\r
        memcpy(buf+16, &target_ks[1], 4);\r

-\r
-       LED_B_ON();\r
-       cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
-       LED_B_OFF();\r
+       memcpy(buf+20, &authentication_timeout, 4);\r
+       memcpy(buf+24, &fixed_nt, 4);\r

 \r
        if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
 \r
 \r
        if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
 \r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
+\r
+       LED_A_OFF();\r

 }\r
 \r
 }\r
 \r

+\r

 //-----------------------------------------------------------------------------\r
 // MIFARE check keys. key count up to 85.\r
 //\r
 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\r
 // MIFARE check keys. key count up to 85.\r
 //\r
 //-----------------------------------------------------------------------------\r

-void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
+void MifareChkKeys(uint16_t arg0, uint32_t arg1, uint8_t arg2, uint8_t *datain) {\r
+\r

        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t blockNo = arg0 & 0xff;\r

-       uint8_t keyType = (arg0 >> 8) & 0xff;\r
+       uint8_t keyType = arg0 >> 8;\r

        bool clearTrace = arg1 & 0x01;\r
        bool multisectorCheck = arg1 & 0x02;\r
        bool clearTrace = arg1 & 0x01;\r
        bool multisectorCheck = arg1 & 0x02;\r

-       uint8_t set14aTimeout = (arg1 >> 8) & 0xff;\r
+       bool init = arg1 & 0x04;\r
+       bool drop_field = arg1 & 0x08;\r
+       bool fixed_nonce = arg1 & 0x10;\r
+       uint32_t auth_timeout = arg1 >> 16;\r

        uint8_t keyCount = arg2;\r
 \r
        LED_A_ON();\r
 \r
        uint8_t keyCount = arg2;\r
 \r
        LED_A_ON();\r
 \r

-       // clear debug level\r
-       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r
-       MF_DBGLEVEL = MF_DBG_NONE;\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
+       if (init) {\r
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       }\r
+       \r

        if (clearTrace) {\r
                clear_trace();\r
        }\r
        set_tracing(true);\r
 \r
        if (clearTrace) {\r
                clear_trace();\r
        }\r
        set_tracing(true);\r
 \r

-       if (set14aTimeout){\r
-               iso14a_set_timeout(set14aTimeout * 10); // timeout: ms = x/106  35-minimum, 50-OK 106-recommended 500-safe\r
-       }\r
+       // clear debug level. We are expecting lots of authentication failures...\r
+       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r
+       MF_DBGLEVEL = MF_DBG_NONE;\r

 \r
 \r

+       int res = 0;\r

        if (multisectorCheck) {\r
                TKeyIndex keyIndex = {{0}};\r
                uint8_t sectorCnt = blockNo;\r
        if (multisectorCheck) {\r
                TKeyIndex keyIndex = {{0}};\r
                uint8_t sectorCnt = blockNo;\r

-               int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);\r
-\r
+               res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, &auth_timeout, OLD_MF_DBGLEVEL, &keyIndex);\r

                if (res >= 0) {\r
                        cmd_send(CMD_ACK, 1, res, 0, keyIndex, 80);\r
                } else {\r
                        cmd_send(CMD_ACK, 0, res, 0, NULL, 0);\r
                }\r
                if (res >= 0) {\r
                        cmd_send(CMD_ACK, 1, res, 0, keyIndex, 80);\r
                } else {\r
                        cmd_send(CMD_ACK, 0, res, 0, NULL, 0);\r
                }\r

-       } else {        \r
-               int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);\r
-               \r
+       } else if (fixed_nonce) {\r
+               res = MifareChkBlockKeysFixedNonce(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r
+               if (res > 0) {\r
+                       cmd_send(CMD_ACK, 1, res, 0, NULL, 0); // key found\r
+               } else {\r
+                       cmd_send(CMD_ACK, 0, res, 0, NULL, 0); // no key found or aborted\r
+               }\r
+       } else {\r
+               res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r

                if (res > 0) {\r
                        cmd_send(CMD_ACK, 1, res, 0, datain + (res - 1) * 6, 6);\r
                } else {\r
                if (res > 0) {\r
                        cmd_send(CMD_ACK, 1, res, 0, datain + (res - 1) * 6, 6);\r
                } else {\r


@@ -1039,12 +1043,14 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LED_D_OFF();\r
+       if (drop_field || res != 0) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+               LED_D_OFF();\r
+       }\r

 \r
        // restore debug level\r
        MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r
 \r
        // restore debug level\r
        MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r

-       \r
+\r

        LED_A_OFF();\r
 }\r
 \r
        LED_A_OFF();\r
 }\r
 \r


@@ -1074,7 +1080,7 @@ void MifarePersonalizeUID(uint8_t keyType, uint8_t perso_option, uint8_t *data)
 \r
                uint8_t block_number = 0;\r
                uint64_t key = bytes_to_num(data, 6);\r
 \r
                uint8_t block_number = 0;\r
                uint64_t key = bytes_to_num(data, 6);\r

-               if (mifare_classic_auth(pcs, cuid, block_number, keyType, key, AUTH_FIRST)) {\r
+               if (mifare_classic_auth(pcs, cuid, block_number, keyType, key, AUTH_FIRST, NULL)) {\r

                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                }\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
                        break;\r
                }\r


@@ -1175,13 +1181,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                ui64Key = emlGetKey(sectorNo, keyType);\r
                if (sectorNo == 0){\r
        for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                ui64Key = emlGetKey(sectorNo, keyType);\r
                if (sectorNo == 0){\r

-                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
+                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\r

                                isOK = false;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth error", sectorNo);\r
                                break;\r
                        }\r
                } else {\r
                                isOK = false;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth error", sectorNo);\r
                                break;\r
                        }\r
                } else {\r

-                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {\r
+                       if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED, NULL)) {\r

                                isOK = false;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r
                                break;\r
                                isOK = false;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r
                                break;\r


@@ -1351,13 +1357,14 @@ void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
                break;\r
        }\r
 \r
                break;\r
        }\r
 \r

+       // reset fpga\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        // send USB response\r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,NULL,0);\r
        LED_B_OFF();\r
 \r
        // send USB response\r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,NULL,0);\r
        LED_B_OFF();\r
 \r

-       // reset fpga\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 \r
        return;\r
        LEDsoff();\r
 \r
        return;\r


@@ -1489,14 +1496,15 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                break;\r
        }\r
 \r
                break;\r
        }\r
 \r

+       if ((workFlags & 0x10) || (!isOK)) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       }\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
        LED_B_OFF();\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
        LED_B_OFF();\r
 \r

-       if ((workFlags & 0x10) || (!isOK)) {\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
-       }\r
+       LEDsoff();\r

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


@@ -1573,6 +1581,10 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                break;\r
        }\r
 \r
                break;\r
        }\r
 \r

+       if ((workFlags & 0x10) || (!isOK)) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       }\r
+\r

        LED_B_ON();\r
        if (workFlags & 0x20) {\r
                if (isOK)\r
        LED_B_ON();\r
        if (workFlags & 0x20) {\r
                if (isOK)\r


@@ -1582,10 +1594,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                cmd_send(CMD_ACK,isOK,0,0,data,18);\r
        LED_B_OFF();\r
 \r
                cmd_send(CMD_ACK,isOK,0,0,data,18);\r
        LED_B_OFF();\r
 \r

-       if ((workFlags & 0x10) || (!isOK)) {\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
-       }\r
+       LEDsoff();\r

 }\r
 \r
 void MifareCIdent(){\r
 }\r
 \r
 void MifareCIdent(){\r


@@ -1621,11 +1630,12 @@ void MifareCIdent(){
        // From iceman1001: removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
 \r
        // From iceman1001: removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
 \r

+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        LED_B_OFF();\r
 \r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        LED_B_OFF();\r
 \r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r


@@ -1656,7 +1666,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r

-       cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
+\r
+       cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));\r

 }\r
 \r
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r
 }\r
 \r
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r


@@ -1670,16 +1681,17 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
 \r
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
 \r
 \r
        isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
 \r

-       if( isOK) {\r
+       if (isOK) {\r

                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r
                OnError(4);\r
                return;\r
        }\r
 \r
                if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r
                OnError(4);\r
                return;\r
        }\r
 \r

+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+\r

        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
 \r
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
 \r
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

        LEDsoff();\r
 }\r
 \r
        LEDsoff();\r
 }\r
 \r