]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
ADD: @pwpivi latest fixes.
[proxmark3-svn] / armsrc / mifarecmd.c
index 6bb04caf26f13f9b649aa5d63575356d8fbd2b1a..5d10ad8161c2a97227ff9fbd91b728d87bfb68a9 100644 (file)
@@ -16,8 +16,7 @@
 #include "mifarecmd.h"\r
 #include "apps.h"\r
 #include "util.h"\r
-//#include "../client/loclass/des.h"\r
-#include "des.h"\r
+\r
 #include "crc.h"\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -87,184 +86,94 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r
 \r
-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
-\r
-       byte_t dataoutbuf[16] = {0x00};\r
-       uint8_t uid[10] = {0x00};\r
-       uint32_t cuid = 0x00;\r
+       bool turnOffField = (arg0 == 1);\r
 \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
-    \r
        clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
        };\r
        \r
-       if(mifare_ultra_auth1(dataoutbuf)){\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r
+       if(!mifare_ultra_auth(keybytes)){\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
                OnError(1);\r
                return;\r
        }\r
 \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
-    \r
-    cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);\r
-       LEDsoff();\r
-}\r
-void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r
-\r
-       uint8_t key[16] = {0x00};\r
-       byte_t dataoutbuf[16] = {0x00};\r
-    \r
-       memcpy(key, datain, 16);\r
-    \r
-       LED_A_ON();     LED_B_OFF(); LED_C_OFF();\r
-       \r
-       if(mifare_ultra_auth2(key, dataoutbuf)){\r
-           if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");\r
-               OnError(1);\r
-               return;                 \r
+       if (turnOffField) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+               LEDsoff();\r
        }\r
-       \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
-    \r
-       cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       cmd_send(CMD_ACK,1,0,0,0,0);\r
 }\r
 \r
 // Arg0 = BlockNo,\r
 // Arg1 = UsePwd bool\r
-// datain = PWD bytes,  \r
+// datain = PWD bytes,\r
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r
 {\r
        uint8_t blockNo = arg0;\r
        byte_t dataout[16] = {0x00};\r
-       uint8_t uid[10] = {0x00};\r
-    bool usePwd = (arg1 == 1);\r
+       bool useKey = (arg1 == 1); //UL_C\r
+       bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
 \r
-       LEDsoff();      \r
-       LED_A_ON();    \r
+       LEDsoff();\r
+       LED_A_ON();\r
        clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-    \r
-       int len = iso14443a_select_card(uid, NULL, NULL);\r
+\r
+       int len = iso14443a_select_card(NULL, NULL, NULL);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
                OnError(1);\r
                return;\r
        }\r
-       \r
-        // authenticate here.\r
-       if ( usePwd ) {\r
 \r
-               uint8_t key[16] = {0x00};       \r
-               memcpy(key, datain, 16);\r
-                \r
-               uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };\r
-               uint8_t random_b[8] = {0x00};\r
-               uint8_t enc_random_b[8] = {0x00};\r
-               uint8_t rnd_ab[16] = {0x00};\r
-               uint8_t IV[8] = {0x00};\r
-               \r
-               uint16_t len;\r
-               uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-               uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-       \r
-               len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+       // UL-C authentication\r
+       if ( useKey ) {\r
+               uint8_t key[16] = {0x00};\r
+               memcpy(key, datain, sizeof(key) );\r
+\r
+               if ( !mifare_ultra_auth(key) ) {\r
                        OnError(1);\r
                        return;\r
                }\r
-       \r
-               // tag nonce.\r
-               memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
-               // decrypt nonce.\r
-               tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
-               rol(random_b,8);\r
-               memcpy(rnd_ab  ,random_a,8);\r
-               memcpy(rnd_ab+8,random_b,8);\r
-\r
-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-                       Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                               enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],\r
-                               enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);\r
-                               \r
-                       Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                               random_b[0],random_b[1],random_b[2],random_b[3],\r
-                               random_b[4],random_b[5],random_b[6],random_b[7]);\r
-\r
-                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
-                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
-                                       \r
-                       Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
-                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );\r
-               }\r
-               \r
-               // encrypt    out, in, length, key, iv\r
-               tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+       }\r
 \r
-               \r
-               len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+       // UL-EV1 / NTAG authentication\r
+       if ( usePwd ) {\r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain, 4);\r
+               uint8_t pack[4] = {0,0,0,0};\r
+               if (!mifare_ul_ev1_auth(pwd, pack)) {\r
                        OnError(1);\r
                        return;\r
                }\r
+       }       \r
 \r
-               uint8_t enc_resp[8] = { 0 };\r
-               uint8_t resp_random_a[8] = { 0 };\r
-               memcpy(enc_resp, receivedAnswer+1, 8);\r
-       \r
-               // decrypt    out, in, length, key, iv \r
-               tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
-               if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
-                       Dbprintf("failed authentication");\r
-\r
-               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", \r
-                                       rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
-                                       rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
-\r
-                       Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
-                                       rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);\r
-\r
-                       Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       random_a[0],random_a[1],random_a[2],random_a[3],\r
-                                       random_a[4],random_a[5],random_a[6],random_a[7]);\r
-                                       \r
-                       Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",\r
-                                       resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r
-                                       resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r
-               }\r
-       }\r
-               \r
        if( mifare_ultra_readblock(blockNo, dataout) ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r
                OnError(2);\r
                return;\r
        }\r
-        \r
+\r
        if( mifare_ultra_halt() ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
                OnError(3);\r
                return;\r
        }\r
-               \r
+\r
     cmd_send(CMD_ACK,1,0,0,dataout,16);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
+\r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)\r
@@ -300,7 +209,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                isOK = 0;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
-\r
+       \r
        \r
        if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
                isOK = 0;\r
@@ -339,16 +248,25 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 // datain = KEY bytes\r
 void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
 {\r
+       // free eventually allocated BigBuf memory\r
+       BigBuf_free();\r
+       clear_trace();\r
+\r
        // params\r
        uint8_t blockNo = arg0;\r
        uint16_t blocks = arg1;\r
-       bool useKey = (arg2 == 1);\r
-       int countpages = 0;\r
-       uint8_t dataout[176] = {0x00};;\r
+       bool useKey = (arg2 == 1); //UL_C\r
+       bool usePwd = (arg2 == 2); //UL_EV1/NTAG\r
+       uint32_t countblocks = 0;\r
+       uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);\r
+       if (dataout == NULL){\r
+               Dbprintf("out of memory");\r
+               OnError(1);\r
+               return;\r
+       }\r
 \r
        LEDsoff();\r
-       LED_A_ON(); \r
-       clear_trace();\r
+       LED_A_ON();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        int len = iso14443a_select_card(NULL, NULL, NULL);\r
@@ -357,84 +275,68 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                OnError(1);\r
                return;\r
        }\r
-       \r
-       // authenticate\r
+\r
+       // UL-C authentication\r
        if ( useKey ) {\r
-               \r
-               uint8_t key[16] = {0x00};       \r
-               memcpy(key, datain, 16);\r
-                \r
-               uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };\r
-               uint8_t random_b[8] = {0x00};\r
-               uint8_t enc_random_b[8] = {0x00};\r
-               uint8_t rnd_ab[16] = {0x00};\r
-               uint8_t IV[8] = {0x00};\r
-               \r
-               uint16_t len;\r
-               uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-               uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-       \r
-               len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
-               if (len != 11) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+               uint8_t key[16] = {0x00};\r
+               memcpy(key, datain, sizeof(key) );\r
+\r
+               if ( !mifare_ultra_auth(key) ) {\r
                        OnError(1);\r
                        return;\r
                }\r
-       \r
-               // tag nonce.\r
-               memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
-               // decrypt nonce.\r
-               tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
-               rol(random_b,8);\r
-               memcpy(rnd_ab  ,random_a,8);\r
-               memcpy(rnd_ab+8,random_b,8);\r
-       \r
-               // encrypt    out, in, length, key, iv\r
-               tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+       }\r
 \r
-               len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
-               if (len != 11) {\r
+       // UL-EV1 / NTAG authentication\r
+       if (usePwd) {\r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain, sizeof(pwd));\r
+               uint8_t pack[4] = {0,0,0,0};\r
+\r
+               if (!mifare_ul_ev1_auth(pwd, pack)){\r
                        OnError(1);\r
-                       return;\r
+                       return;                 \r
                }\r
-\r
-               uint8_t enc_resp[8] = { 0 };\r
-               uint8_t resp_random_a[8] = { 0 };\r
-               memcpy(enc_resp, receivedAnswer+1, 8);\r
-       \r
-               // decrypt    out, in, length, key, iv \r
-               tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
-               if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
-                       Dbprintf("failed authentication");\r
        }\r
-       \r
+\r
        for (int i = 0; i < blocks; i++){\r
-       \r
-               len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);\r
+               if ((i*4) + 4 >= CARD_MEMORY_SIZE) {\r
+                       Dbprintf("Data exceeds buffer!!");\r
+                       break;\r
+               }\r
+\r
+               len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
                \r
                if (len) {\r
                        if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);\r
-                       OnError(2);\r
+                       // if no blocks read - error out\r
+                       if (i==0){\r
+                               OnError(2);\r
                        return;\r
+                       } else {\r
+                               //stop at last successful read block and return what we got\r
+                               break;\r
+                       }\r
                } else {\r
-                       countpages++;\r
+                       countblocks++;\r
                }\r
        }\r
-               \r
-       if (mifare_ultra_halt()) {\r
+\r
+       len = mifare_ultra_halt();\r
+       if (len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
                OnError(3);\r
                return;\r
        }\r
-       \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("blocks read %d", countpages);\r
 \r
-       len = blocks*4;\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
+\r
+       countblocks *= 4;\r
 \r
-       cmd_send(CMD_ACK, 1, len, 0, dataout, len);     \r
+       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       BigBuf_free();\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -509,17 +411,18 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LEDsoff();\r
 }\r
 \r
-void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
+/* // Command not needed but left for future testing \r
+void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)\r
 {\r
-    uint8_t blockNo = arg0;\r
+       uint8_t blockNo = arg0;\r
        byte_t blockdata[16] = {0x00};\r
 \r
-    memcpy(blockdata, datain, 16);\r
-        \r
+       memcpy(blockdata, datain, 16);\r
+\r
        uint8_t uid[10] = {0x00};\r
 \r
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
-               \r
+\r
        clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
@@ -529,7 +432,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
                return;\r
        };\r
 \r
-       if(mifare_ultra_writeblock(blockNo, blockdata)) {\r
+       if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
                OnError(0);\r
                return; };\r
@@ -539,20 +442,28 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
                OnError(0);\r
                return;\r
        };\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
        LEDsoff();\r
 }\r
-\r
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
+*/\r
+\r
+// Arg0   : Block to write to.\r
+// Arg1   : 0 = use no authentication.\r
+//          1 = use 0x1A authentication.\r
+//          2 = use 0x1B authentication.\r
+// datain : 4 first bytes is data to be written.\r
+//        : 4/16 next bytes is authentication key.\r
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r
 {\r
        uint8_t blockNo = arg0;\r
+       bool useKey = (arg1 == 1); //UL_C\r
+       bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
        byte_t blockdata[4] = {0x00};\r
-       uint8_t uid[10] = {0x00};\r
-       \r
+\r
        memcpy(blockdata, datain,4);\r
        \r
        LEDsoff();\r
@@ -560,13 +471,35 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
        clear_trace();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       if(!iso14443a_select_card(uid, NULL, NULL)) {\r
+       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
        };\r
 \r
-       if(mifare_ultra_special_writeblock(blockNo, blockdata)) {\r
+       // UL-C authentication\r
+       if ( useKey ) {\r
+               uint8_t key[16] = {0x00};       \r
+               memcpy(key, datain+4, sizeof(key) );\r
+\r
+               if ( !mifare_ultra_auth(key) ) {\r
+                       OnError(1);\r
+                       return;                 \r
+               }\r
+       }\r
+       \r
+       // UL-EV1 / NTAG authentication\r
+       if (usePwd) { \r
+               uint8_t pwd[4] = {0x00};\r
+               memcpy(pwd, datain+4, 4);\r
+               uint8_t pack[4] = {0,0,0,0};\r
+               if (!mifare_ul_ev1_auth(pwd, pack)) {\r
+                       OnError(1);\r
+                       return;                 \r
+               }\r
+       }\r
+       \r
+       if(mifare_ultra_writeblock(blockNo, blockdata)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(0);\r
                return;\r
@@ -606,7 +539,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[6];\r
        blockdata[2] = pwd[5];\r
        blockdata[3] = pwd[4];\r
-       if(mifare_ultra_special_writeblock( 44, blockdata)) {\r
+       if(mifare_ultra_writeblock( 44, blockdata)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(44);\r
                return;\r
@@ -616,7 +549,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[2];\r
        blockdata[2] = pwd[1];\r
        blockdata[3] = pwd[0];\r
-       if(mifare_ultra_special_writeblock( 45, blockdata)) {\r
+       if(mifare_ultra_writeblock( 45, blockdata)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(45);\r
                return;\r
@@ -626,7 +559,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[14];\r
        blockdata[2] = pwd[13];\r
        blockdata[3] = pwd[12];\r
-       if(mifare_ultra_special_writeblock( 46, blockdata)) {\r
+       if(mifare_ultra_writeblock( 46, blockdata)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(46);\r
                return;\r
@@ -636,7 +569,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        blockdata[1] = pwd[10];\r
        blockdata[2] = pwd[9];\r
        blockdata[3] = pwd[8];\r
-       if(mifare_ultra_special_writeblock( 47, blockdata)) {\r
+       if(mifare_ultra_writeblock( 47, blockdata)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
                OnError(47);\r
                return;\r
@@ -809,7 +742,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r
-                       len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
+                       len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
                        if (len != 4) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
                                continue;\r
@@ -1406,4 +1339,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
-}\r
+}
\ No newline at end of file
Impressum, Datenschutz