]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifareutil.c
Fix some printf/scanf format strings
[proxmark3-svn] / armsrc / mifareutil.c
index 93df109c8c264a86a247edf65f2f1d9d0d807d43..e46c5515dd065790876abeeecaeadb15575b0cbc 100644 (file)
@@ -78,8 +78,7 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 }\r
 \r
 // send X byte basic commands\r
-int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r
-{\r
+int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {\r
        uint8_t dcmd[data_size+3];\r
        dcmd[0] = cmd;\r
        memcpy(dcmd+1,data,data_size);\r
@@ -95,8 +94,7 @@ int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answe
 }\r
 \r
 // send 2 byte commands\r
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r
-{\r
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {\r
        uint8_t dcmd[4], ecmd[4];\r
        uint16_t pos, res;\r
        uint8_t par[1];         // 1 Byte parity is enough here\r
@@ -211,7 +209,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        //  ar+parity\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
+               mf_nr_ar[pos] = crypto1_byte(pcs, 0x00, 0) ^ (nt & 0xff);\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r
        }\r
 \r
@@ -814,18 +812,17 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 //\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, uint32_t *auth_timeout, uint8_t debugLevel) {\r
+static int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint8_t *key, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, bool fixed_nonce) {\r
 \r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \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 (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card");\r
-                       return  1;\r
+                       return  -1;\r
                }\r
                switch (card_info.uidlen) {\r
                        case 4 : *cascade_levels = 1; break;\r
@@ -836,63 +833,85 @@ int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uin
        } 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 (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);\r
-                       return  1;\r
+                       return  -1;\r
                }\r
        }\r
 \r
-       if (mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST, auth_timeout)) { // authentication failed\r
-               return 2;\r
+       if (!fixed_nonce) {\r
+               uint64_t ui64Key = bytes_to_num(key, 6);\r
+               if (mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST, auth_timeout)) { // authentication failed\r
+                       return -2;\r
+               } else {\r
+                       mifare_classic_halt(pcs, *cuid);\r
+               }\r
        } else {\r
-               mifare_classic_halt(pcs, *cuid);\r
+               uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+               uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+               // Transmit MIFARE_CLASSIC_AUTH\r
+               int len = mifare_sendcmd_short(pcs, false, keyType & 0x01 ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+               if (len != 4) return -2;\r
+               // Transmit encrypted reader nonce and reader answer\r
+               uint8_t mf_nr_ar[8] = NESTED_FIXED_NR_ENC;\r
+               memcpy(mf_nr_ar + 4, key, 4);\r
+               ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), key + 4, NULL);\r
+               uint32_t save_timeout = iso14a_get_timeout(); // save standard timeout\r
+               iso14a_set_timeout(*auth_timeout);            // set timeout for authentication response\r
+               len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r
+               iso14a_set_timeout(save_timeout);             // restore standard timeout\r
+               if (!len) return -2;\r
        }\r
 \r
-       return 0;\r
+       return 0; // success\r
 }\r
 \r
-\r
 // multi key check\r
-int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r
+static int MifareChkBlockKeysEx(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, bool fixed_nonce) {\r
 \r
        uint8_t uid[10];\r
        uint32_t cuid = 0;\r
        uint8_t cascade_levels = 0;\r
-       uint64_t ui64Key = 0;\r
 \r
        int retryCount = 0;\r
        for (uint8_t i = 0; i < keyCount; i++) {\r
-\r
-               ui64Key = bytes_to_num(keys + i * 6, 6);\r
-               int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, auth_timeout, debugLevel);\r
-\r
-               // can't select\r
-               if (res == 1) {\r
+               uint8_t bytes_per_key = fixed_nonce ? 5 : 6;\r
+               int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, keys + i*bytes_per_key, blockNo, keyType, auth_timeout, debugLevel, fixed_nonce);\r
+               if (res == -1) {                // couldn't select\r
                        retryCount++;\r
                        if (retryCount >= 5) {\r
-                               Dbprintf("ChkKeys: block=%d key=%d. Can't select. Exit...", blockNo, keyType);\r
+                               Dbprintf("ChkKeys: block=%d key=%d. Couldn't select. Exit...", blockNo, keyType);\r
                                return -1;\r
+                       } else {\r
+                               --i; // try the same key once again\r
+                               SpinDelay(20);\r
+                               // Dbprintf("ChkKeys: block=%d key=%d. Try the same key once again...", blockNo, keyType);\r
+                               continue;\r
                        }\r
-                       --i; // try the same key once again\r
-\r
-                       SpinDelay(20);\r
-//          Dbprintf("ChkKeys: block=%d key=%d. Try the same key once again...", blockNo, keyType);\r
-                       continue;\r
                }\r
-\r
-               // can't authenticate\r
-               if (res == 2) {\r
+               if (res == -2) {                // couldn't authenticate with this key\r
                        retryCount = 0;\r
-                       continue; // can't auth. wrong key.\r
+                       continue;\r
                }\r
 \r
-               // successful authentication\r
-               return i + 1;\r
+               return i + 1;           // successful authentication\r
+\r
        }\r
 \r
        if (BUTTON_PRESS()) {\r
                return -2;\r
        }\r
 \r
-       return 0;\r
+       return 0;                   // couldn't authenticate with any key\r
+}\r
+\r
+\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r
+       return MifareChkBlockKeysEx(keys, keyCount, blockNo, keyType, auth_timeout, debugLevel, false);\r
+}\r
+\r
+\r
+// fixed nonce check\r
+int MifareChkBlockKeysFixedNonce(uint8_t *ar_par, uint8_t ar_par_cnt, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r
+       return MifareChkBlockKeysEx(ar_par, ar_par_cnt, blockNo, keyType, auth_timeout, debugLevel, true);\r
 }\r
 \r
 \r
Impressum, Datenschutz