From: Fl0-0 Date: Wed, 12 Jul 2017 13:58:32 +0000 (+0200) Subject: Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compati... X-Git-Tag: v3.1.0~189 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7906cb41ff3566aa1c27b71e457a59b4ca3e749a?ds=sidebyside;hp=-c Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility (#349) * Improve 'Magic' Mifare tags detection * Magic Mifare tags detection and version printing * Magic s50/1k tag halt error correction for cload and csave * hf mf c* commands for gen1b * Use |= for bitwise operation * gen1b: don't issue wipe command and don't expect response from WUPC1 magic command after a SELECT_UID: old UID display works in hf mf csetuid * hf mf cgetsc compatibility for 4k * hf mf csave compatibility for 4k * hf mf cload compatibility for 4k, suppress halt errors messages for debug level 2 * Revert to MF_DBG_ERROR level in mifare_classic_halt() and don't issue the halt command for gen1b * Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility --- 7906cb41ff3566aa1c27b71e457a59b4ca3e749a diff --git a/CHANGELOG.md b/CHANGELOG.md index 80c823d4..6fdda88b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,13 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac ## [unreleased][unreleased] ### Changed +- Improved backdoor detection missbehaving magic s50/1k tag (Fl0-0) ### Fixed ### Added +- Added hf mf c* commands compatibity for 4k and gen1b backdoor (Fl0-0) +- Added backdoor detection for gen1b magic s70/4k tag (Fl0-0) - Added data fsktonrz, a fsk cleaning/demodulating routine for weak fsk signal. Note: follow this up with a `data rawdemod nr` to finish demoding your signal. - Added lf em 410xbrute, LF EM410x reader bruteforce attack by simulating UIDs from a file (Fl0-0) diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 6f57c113..0e9c3672 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -21,8 +21,8 @@ #include "crc.h" #define AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation) -#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication - +#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication + // the block number for the ISO14443-4 PCB static uint8_t pcb_blocknum = 0; @@ -30,7 +30,7 @@ static uint8_t pcb_blocknum = 0; static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4}; //----------------------------------------------------------------------------- -// Select, Authenticate, Read a MIFARE tag. +// Select, Authenticate, Read a MIFARE tag. // read block //----------------------------------------------------------------------------- void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) @@ -40,7 +40,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) uint8_t keyType = arg1; uint64_t ui64Key = 0; ui64Key = bytes_to_num(datain, 6); - + // variables byte_t isOK = 0; byte_t dataoutbuf[16]; @@ -68,7 +68,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) if (MF_DBGLEVEL >= 1) Dbprintf("Auth error"); break; }; - + if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) { if (MF_DBGLEVEL >= 1) Dbprintf("Read block error"); break; @@ -78,14 +78,14 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); break; }; - + isOK = 1; break; } - + // ----------------------------- crypto1 destroy crypto1_destroy(pcs); - + if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED"); LED_B_ON(); @@ -111,7 +111,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){ OnError(0); return; }; - + if(!mifare_ultra_auth(keybytes)){ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed"); OnError(1); @@ -168,7 +168,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) OnError(1); return; } - } + } if( mifare_ultra_readblock(blockNo, dataout) ) { if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error"); @@ -188,7 +188,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) } //----------------------------------------------------------------------------- -// Select, Authenticate, Read a MIFARE tag. +// Select, Authenticate, Read a MIFARE tag. // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes) //----------------------------------------------------------------------------- void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) @@ -198,7 +198,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) uint8_t keyType = arg1; uint64_t ui64Key = 0; ui64Key = bytes_to_num(datain, 6); - + // variables byte_t isOK = 0; byte_t dataoutbuf[16 * 16]; @@ -222,12 +222,12 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card"); } - + if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) { isOK = 0; if (MF_DBGLEVEL >= 1) Dbprintf("Auth error"); } - + for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) { if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) { isOK = 0; @@ -235,14 +235,14 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) break; } } - + if(mifare_classic_halt(pcs, cuid)) { if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); } // ----------------------------- crypto1 destroy crypto1_destroy(pcs); - + if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED"); LED_B_ON(); @@ -307,7 +307,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) if (!mifare_ul_ev1_auth(pwd, pack)){ OnError(1); - return; + return; } } @@ -316,7 +316,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) Dbprintf("Data exceeds buffer!!"); break; } - + len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i); if (len) { @@ -352,7 +352,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) } //----------------------------------------------------------------------------- -// Select, Authenticate, Write a MIFARE tag. +// Select, Authenticate, Write a MIFARE tag. // read block //----------------------------------------------------------------------------- void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) @@ -365,7 +365,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) ui64Key = bytes_to_num(datain, 6); memcpy(blockdata, datain + 10, 16); - + // variables byte_t isOK = 0; uint8_t uid[10]; @@ -392,7 +392,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) if (MF_DBGLEVEL >= 1) Dbprintf("Auth error"); break; }; - + if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) { if (MF_DBGLEVEL >= 1) Dbprintf("Write block error"); break; @@ -402,14 +402,14 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); break; }; - + isOK = 1; break; } - + // ----------------------------- crypto1 destroy crypto1_destroy(pcs); - + if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED"); LED_B_ON(); @@ -422,7 +422,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) LEDsoff(); } -/* // Command not needed but left for future testing +/* // Command not needed but left for future testing void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain) { uint8_t blockNo = arg0; @@ -476,7 +476,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) byte_t blockdata[4] = {0x00}; memcpy(blockdata, datain,4); - + LEDsoff(); LED_A_ON(); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); @@ -499,7 +499,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) return; } } - + // UL-EV1 / NTAG authentication if (usePwd) { uint8_t pwd[4] = {0x00}; @@ -531,12 +531,12 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) } void MifareUSetPwd(uint8_t arg0, uint8_t *datain){ - + uint8_t pwd[16] = {0x00}; byte_t blockdata[4] = {0x00}; - + memcpy(pwd, datain, 16); - + LED_A_ON(); LED_B_OFF(); LED_C_OFF(); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); @@ -586,7 +586,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error"); OnError(47); return; - }; + }; if(mifare_ultra_halt()) { if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); @@ -610,7 +610,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) { //----------------------------------------------------------------------------- // acquire encrypted nonces in order to perform the attack described in // Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened -// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on +// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on // Computer and Communications Security, 2015 //----------------------------------------------------------------------------- void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) @@ -628,7 +628,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t nt_par_enc = 0; uint8_t buf[USB_CMD_DATA_SIZE]; uint32_t timeout; - + uint8_t blockNo = arg0 & 0xff; uint8_t keyType = (arg0 >> 8) & 0xff; uint8_t targetBlockNo = arg1 & 0xff; @@ -637,7 +637,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, bool initialize = flags & 0x0001; bool slow = flags & 0x0002; bool field_off = flags & 0x0004; - + LED_A_ON(); LED_C_OFF(); @@ -646,9 +646,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, clear_trace(); set_tracing(true); } - + LED_C_ON(); - + uint16_t num_nonces = 0; bool have_uid = false; for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) { @@ -661,7 +661,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, } if (!have_uid) { // need a full select cycle to get the uid first - iso14a_card_select_t card_info; + iso14a_card_select_t card_info; if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) { if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (ALL)"); continue; @@ -672,14 +672,14 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, case 10: cascade_levels = 3; break; default: break; } - have_uid = true; + have_uid = true; } else { // no need for anticollision. We can directly select the card if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) { if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Can't select card (UID)"); continue; } } - + if (slow) { timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME; while(GetCountSspClk() < timeout); @@ -697,12 +697,12 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len); continue; } - + // send a dummy byte as reader response in order to trigger the cards authentication timeout uint8_t dummy_answer = 0; ReaderTransmit(&dummy_answer, 1, NULL); timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT; - + num_nonces++; if (num_nonces % 2) { memcpy(buf+i, receivedAnswer, 4); @@ -716,13 +716,13 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, // wait for the card to become ready again while(GetCountSspClk() < timeout); - + } LED_C_OFF(); - + crypto1_destroy(pcs); - + LED_B_ON(); cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf)); LED_B_OFF(); @@ -737,8 +737,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, //----------------------------------------------------------------------------- -// MIFARE nested authentication. -// +// MIFARE nested authentication. +// //----------------------------------------------------------------------------- void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) { @@ -750,7 +750,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat uint64_t ui64Key = 0; ui64Key = bytes_to_num(datain, 6); - + // variables uint16_t rtr, i, j, len; uint16_t davg; @@ -759,7 +759,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat uint32_t cuid, nt1, nt2, nttmp, nttest, ks1; uint8_t par[1]; uint32_t target_nt[2], target_ks[2]; - + uint8_t par_array[4]; uint16_t ncount = 0; struct Crypto1State mpcs = {0, 0}; @@ -779,7 +779,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat if (calibrate) clear_trace(); set_tracing(true); - + // statistics on nonce distance int16_t isOK = 0; #define NESTED_MAX_TRIES 12 @@ -791,7 +791,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat davg = dmax = 0; dmin = 2000; delta_time = 0; - + for (rtr = 0; rtr < 17; rtr++) { // Test if the action was cancelled @@ -856,17 +856,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat } davg = (davg + (rtr - 1)/2) / (rtr - 1); - + if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time); dmin = davg - 2; dmax = davg + 2; - + LED_B_OFF(); - + } - // ------------------------------------------------------------------------------------------------- - + // ------------------------------------------------------------------------------------------------- + LED_C_ON(); // get crypted nonces for target sector @@ -874,7 +874,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat target_nt[i] = 0; while(target_nt[i] == 0) { // continue until we have an unambiguous nonce - + // prepare next select. No need to power down the card. if(mifare_classic_halt(pcs, cuid)) { if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error"); @@ -885,7 +885,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Can't select card"); continue; }; - + auth1_time = 0; if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) { if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error"); @@ -899,15 +899,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error len=%d", len); continue; }; - - nt2 = bytes_to_num(receivedAnswer, 4); + + nt2 = bytes_to_num(receivedAnswer, 4); if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]); - + // Parity validity check for (j = 0; j < 4; j++) { par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01)); } - + ncount = 0; nttest = prng_successor(nt1, dmin - 1); for (j = dmin; j < dmax + 1; j++) { @@ -936,17 +936,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat } LED_C_OFF(); - + // ----------------------------- crypto1 destroy crypto1_destroy(pcs); - + byte_t buf[4 + 4 * 4]; memcpy(buf, &cuid, 4); memcpy(buf+4, &target_nt[0], 4); memcpy(buf+8, &target_ks[0], 4); memcpy(buf+12, &target_nt[1], 4); memcpy(buf+16, &target_ks[1], 4); - + LED_B_ON(); cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf)); LED_B_OFF(); @@ -958,8 +958,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat } //----------------------------------------------------------------------------- -// MIFARE check keys. key count up to 85. -// +// MIFARE check keys. key count up to 85. +// //----------------------------------------------------------------------------- void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) { @@ -968,7 +968,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) bool clearTrace = arg1; uint8_t keyCount = arg2; uint64_t ui64Key = 0; - + bool have_uid = false; uint8_t cascade_levels = 0; uint32_t timeout = 0; @@ -979,11 +979,11 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) struct Crypto1State mpcs = {0, 0}; struct Crypto1State *pcs; pcs = &mpcs; - + // clear debug level - int OLD_MF_DBGLEVEL = MF_DBGLEVEL; + int OLD_MF_DBGLEVEL = MF_DBGLEVEL; MF_DBGLEVEL = MF_DBG_NONE; - + LED_A_ON(); LED_B_OFF(); LED_C_OFF(); @@ -999,7 +999,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) // Iceman: use piwi's faster nonce collecting part in hardnested. if (!have_uid) { // need a full select cycle to get the uid first - iso14a_card_select_t card_info; + iso14a_card_select_t card_info; if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) { if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card"); --i; // try same key once again @@ -1011,7 +1011,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) case 10: cascade_levels = 3; break; default: break; } - have_uid = true; + have_uid = true; } else { // no need for anticollision. We can directly select the card if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) { if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)"); @@ -1025,16 +1025,16 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) uint8_t dummy_answer = 0; ReaderTransmit(&dummy_answer, 1, NULL); timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT; - + // wait for the card to become ready again while(GetCountSspClk() < timeout); continue; } - + isOK = 1; break; } - + LED_B_ON(); cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6); LED_B_OFF(); @@ -1043,12 +1043,12 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) LEDsoff(); // restore debug level - MF_DBGLEVEL = OLD_MF_DBGLEVEL; + MF_DBGLEVEL = OLD_MF_DBGLEVEL; } //----------------------------------------------------------------------------- // MIFARE commands set debug level -// +// //----------------------------------------------------------------------------- void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){ MF_DBGLEVEL = arg0; @@ -1057,7 +1057,7 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai //----------------------------------------------------------------------------- // Work with emulator memory -// +// // Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not // involved in dealing with emulator memory. But if it is called later, it might // destroy the Emulator Memory. @@ -1085,7 +1085,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) //----------------------------------------------------------------------------- // Load a card into the emulator memory -// +// //----------------------------------------------------------------------------- void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){ uint8_t numSectors = arg0; @@ -1105,17 +1105,17 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai LED_B_OFF(); LED_C_OFF(); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); - + clear_trace(); set_tracing(false); - + bool isOK = true; if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) { isOK = false; if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card"); } - + for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) { ui64Key = emlGetKey(sectorNo, keyType); if (sectorNo == 0){ @@ -1131,7 +1131,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai break; } } - + for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) { if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) { isOK = false; @@ -1160,7 +1160,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); - + if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED"); } @@ -1168,10 +1168,10 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai //----------------------------------------------------------------------------- // Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn) -// +// //----------------------------------------------------------------------------- void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){ - + // params uint8_t needWipe = arg0; // bit 0 - need get UID @@ -1179,20 +1179,21 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai // bit 2 - need HALT after sequence // bit 3 - need init FPGA and field before sequence // bit 4 - need reset FPGA and LED + // bit 6 - gen1b backdoor type uint8_t workFlags = arg1; uint8_t blockNo = arg2; - + // card commands - uint8_t wupC1[] = { 0x40 }; - uint8_t wupC2[] = { 0x43 }; - uint8_t wipeC[] = { 0x41 }; - + uint8_t wupC1[] = { 0x40 }; + uint8_t wupC2[] = { 0x43 }; + uint8_t wipeC[] = { 0x41 }; + // variables byte_t isOK = 0; uint8_t uid[10] = {0x00}; uint8_t d_block[18] = {0x00}; uint32_t cuid; - + uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; @@ -1202,7 +1203,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai LED_B_OFF(); LED_C_OFF(); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); - + clear_trace(); set_tracing(true); } @@ -1214,16 +1215,18 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) { if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card"); break; - }; + }; - if(mifare_classic_halt(NULL, cuid)) { - if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); - break; - }; + if(mifare_classic_halt(NULL, cuid)) { + if (MF_DBGLEVEL > 2) Dbprintf("Halt error"); + // Continue, some magic tags misbehavies and send an answer to it. + // break; + }; }; - + // reset chip - if (needWipe){ + // Wipe command don't work with gen1b + if (needWipe && !(workFlags & 0x40)){ ReaderTransmitBitsPar(wupC1,7,0, NULL); if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); @@ -1237,51 +1240,61 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai }; if(mifare_classic_halt(NULL, cuid)) { - if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); - break; + if (MF_DBGLEVEL > 2) Dbprintf("Halt error"); + // Continue, some magic tags misbehavies and send an answer to it. + // break; }; - }; + }; // write block if (workFlags & 0x02) { ReaderTransmitBitsPar(wupC1,7,0, NULL); - if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { - if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); - break; - }; - ReaderTransmit(wupC2, sizeof(wupC2), NULL); - if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { - if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error"); - break; - }; + // gen1b magic tag : do no issue wupC2 and don't expect 0x0a response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command) + if (!(workFlags & 0x40)) { + + if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { + if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); + break; + }; + + ReaderTransmit(wupC2, sizeof(wupC2), NULL); + if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { + if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error"); + break; + }; + } } if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) { if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error"); break; }; - + memcpy(d_block, datain, 16); AppendCrc14443a(d_block, 16); - + ReaderTransmit(d_block, sizeof(d_block), NULL); if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) { if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error"); break; - }; - + }; + if (workFlags & 0x04) { - if (mifare_classic_halt(NULL, cuid)) { - if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); - break; - }; + // do no issue halt command for gen1b magic tag (#db# halt error. response len: 1) + if (!(workFlags & 0x40)) { + if (mifare_classic_halt(NULL, cuid)) { + if (MF_DBGLEVEL > 2) Dbprintf("Halt error"); + // Continue, some magic tags misbehavies and send an answer to it. + // break; + } + } } - + isOK = 1; break; } - + LED_B_ON(); cmd_send(CMD_ACK,isOK,0,0,uid,4); LED_B_OFF(); @@ -1294,28 +1307,29 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){ - - // params + + // params // bit 1 - need wupC // bit 2 - need HALT after sequence // bit 3 - need init FPGA and field before sequence // bit 4 - need reset FPGA and LED // bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a) + // bit 6 - gen1b backdoor type uint8_t workFlags = arg0; uint8_t blockNo = arg2; - + // card commands - uint8_t wupC1[] = { 0x40 }; - uint8_t wupC2[] = { 0x43 }; - + uint8_t wupC1[] = { 0x40 }; + uint8_t wupC2[] = { 0x43 }; + // variables byte_t isOK = 0; uint8_t data[18] = {0x00}; uint32_t cuid = 0; - + uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; - + if (workFlags & 0x08) { LED_A_ON(); LED_B_OFF(); @@ -1332,14 +1346,16 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); break; - }; - + }; + // do no issue for gen1b magic tag + if (!(workFlags & 0x40)) { ReaderTransmit(wupC2, sizeof(wupC2), NULL); if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error"); break; }; } + } // read block if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) { @@ -1347,18 +1363,22 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai break; }; memcpy(data, receivedAnswer, 18); - + if (workFlags & 0x04) { - if (mifare_classic_halt(NULL, cuid)) { - if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); - break; - }; + // do no issue halt command for gen1b magic tag (#db# halt error. response len: 1) + if (!(workFlags & 0x40)) { + if (mifare_classic_halt(NULL, cuid)) { + if (MF_DBGLEVEL > 1) Dbprintf("Halt error"); + // Continue, some magic tags misbehavies and send an answer to it. + // break; + } + } } - + isOK = 1; break; } - + LED_B_ON(); if (workFlags & 0x20) { if (isOK) @@ -1375,30 +1395,29 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai } void MifareCIdent(){ - + // card commands - uint8_t wupC1[] = { 0x40 }; - uint8_t wupC2[] = { 0x43 }; - + uint8_t wupC1[] = { 0x40 }; + uint8_t wupC2[] = { 0x43 }; + // variables - byte_t isOK = 1; - + byte_t isOK = 0; + uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; ReaderTransmitBitsPar(wupC1,7,0, NULL); - if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { - isOK = 0; - }; + if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) { + isOK = 2; - ReaderTransmit(wupC2, sizeof(wupC2), NULL); - if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { - isOK = 0; + ReaderTransmit(wupC2, sizeof(wupC2), NULL); + if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) { + isOK = 1; + }; }; - if (mifare_classic_halt(NULL, 0)) { - isOK = 0; - }; + // From iceman1001: removed the if, since some magic tags misbehavies and send an answer to it. + mifare_classic_halt(NULL, 0); cmd_send(CMD_ACK,isOK,0,0,0,0); } @@ -1412,7 +1431,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){ byte_t dataout[11] = {0x00}; uint8_t uid[10] = {0x00}; uint32_t cuid; - + iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); clear_trace(); @@ -1439,13 +1458,13 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){ uint8_t key[16] = {0x00}; byte_t isOK = 0; byte_t dataout[12] = {0x00}; - + memcpy(key, datain, 16); - + isOK = mifare_desfire_des_auth2(cuid, key, dataout); - + if( isOK) { - if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed"); + if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed"); OnError(4); return; } diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index bab3591e..b75215a0 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -411,8 +411,13 @@ int CmdHF14AReader(const char *Cmd) c.arg[2] = 0; SendCommand(&c); WaitForResponse(CMD_ACK,&resp); - uint8_t isOK = resp.arg[0] & 0xff; - PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") ); + + uint8_t isGeneration = resp.arg[0] & 0xff; + switch( isGeneration ){ + case 1: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1a): YES"); break; + case 2: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1b): YES"); break; + default: PrintAndLog("Answers to chinese magic backdoor commands: NO"); break; + } // disconnect c.cmd = CMD_READER_ISO_14443a; diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index d909cd8c..90ebc27b 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -28,7 +28,6 @@ #define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up - static int CmdHelp(const char *Cmd); int CmdHF14AMifare(const char *Cmd) @@ -45,7 +44,7 @@ int CmdHF14AMifare(const char *Cmd) case -5 : PrintAndLog("Aborted via keyboard."); return 1; default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key); } - + PrintAndLog(""); return 0; } @@ -57,14 +56,14 @@ int CmdHF14AMfWrBl(const char *Cmd) uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - + char cmdp = 0x00; if (strlen(Cmd)<3) { PrintAndLog("Usage: hf mf wrbl "); PrintAndLog(" sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F"); return 0; - } + } blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); @@ -83,7 +82,7 @@ int CmdHF14AMfWrBl(const char *Cmd) } PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6)); PrintAndLog("--data: %s", sprint_hex(bldata, 16)); - + UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); memcpy(c.d.asBytes + 10, bldata, 16); @@ -105,7 +104,7 @@ int CmdHF14AMfRdBl(const char *Cmd) uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; - + char cmdp = 0x00; @@ -113,8 +112,8 @@ int CmdHF14AMfRdBl(const char *Cmd) PrintAndLog("Usage: hf mf rdbl "); PrintAndLog(" sample: hf mf rdbl 0 A FFFFFFFFFFFF "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); if (cmdp == 0x00) { @@ -127,7 +126,7 @@ int CmdHF14AMfRdBl(const char *Cmd) return 1; } PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -162,8 +161,8 @@ int CmdHF14AMfRdSc(const char *Cmd) PrintAndLog("Usage: hf mf rdsc "); PrintAndLog(" sample: hf mf rdsc 0 A FFFFFFFFFFFF "); return 0; - } - + } + sectorNo = param_get8(Cmd, 0); if (sectorNo > 39) { PrintAndLog("Sector number must be less than 40"); @@ -180,7 +179,7 @@ int CmdHF14AMfRdSc(const char *Cmd) return 1; } PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -226,28 +225,28 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo) int CmdHF14AMfDump(const char *Cmd) { uint8_t sectorNo, blockNo; - + uint8_t keyA[40][6]; uint8_t keyB[40][6]; uint8_t rights[40][4]; uint8_t carddata[256][16]; uint8_t numSectors = 16; - + FILE *fin; FILE *fout; - + UsbCommand resp; char cmdp = param_getchar(Cmd, 0); switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf dump [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -256,12 +255,12 @@ int CmdHF14AMfDump(const char *Cmd) PrintAndLog(" hf mf dump 4"); return 0; } - + if ((fin = fopen("dumpkeys.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + // Read keys A from file for (sectorNo=0; sectorNo 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf restore [card memory]"); @@ -437,7 +436,7 @@ int CmdHF14AMfRestore(const char *Cmd) PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys); if (bytes_read != 6) { @@ -461,21 +460,21 @@ int CmdHF14AMfRestore(const char *Cmd) if ((fdump = fopen("dumpdata.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpdata.bin"); return 1; - } + } PrintAndLog("Restoring dumpdata.bin to card"); for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) { UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); - + size_t bytes_read = fread(bldata, 1, 16, fdump); if (bytes_read != 16) { PrintAndLog("File reading error (dumpdata.bin)."); fclose(fdump); return 2; } - + if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer bldata[0] = (keyA[sectorNo][0]); bldata[1] = (keyA[sectorNo][1]); @@ -489,10 +488,10 @@ int CmdHF14AMfRestore(const char *Cmd) bldata[13] = (keyB[sectorNo][3]); bldata[14] = (keyB[sectorNo][4]); bldata[15] = (keyB[sectorNo][5]); - } - + } + PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16)); - + memcpy(c.d.asBytes + 10, bldata, 16); SendCommand(&c); @@ -505,7 +504,7 @@ int CmdHF14AMfRestore(const char *Cmd) } } } - + fclose(fdump); return 0; } @@ -530,12 +529,12 @@ int CmdHF14AMfNested(const char *Cmd) uint8_t keyBlock[14*6]; uint64_t key64 = 0; bool transferToEml = false; - + bool createDumpFile = false; FILE *fkeys; uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - + char cmdp, ctmp; if (strlen(Cmd)<3) { @@ -552,25 +551,25 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog(" sample3: hf mf nested 1 0 A FFFFFFFFFFFF d "); PrintAndLog(" sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A"); return 0; - } - + } + cmdp = param_getchar(Cmd, 0); blockNo = param_get8(Cmd, 1); ctmp = param_getchar(Cmd, 2); - + if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { PrintAndLog("Key type must be A or B"); return 1; } - - if (ctmp != 'A' && ctmp != 'a') + + if (ctmp != 'A' && ctmp != 'a') keyType = 1; - + if (param_gethex(Cmd, 3, key, 12)) { PrintAndLog("Key must include 12 HEX symbols"); return 1; } - + if (cmdp == 'o' || cmdp == 'O') { cmdp = 'o'; trgBlockNo = param_get8(Cmd, 4); @@ -579,10 +578,10 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog("Target key type must be A or B"); return 1; } - if (ctmp != 'A' && ctmp != 'a') + if (ctmp != 'A' && ctmp != 'a') trgKeyType = 1; } else { - + switch (cmdp) { case '0': SectorsCnt = 05; break; case '1': SectorsCnt = 16; break; @@ -595,11 +594,11 @@ int CmdHF14AMfNested(const char *Cmd) ctmp = param_getchar(Cmd, 4); if (ctmp == 't' || ctmp == 'T') transferToEml = true; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true; - + ctmp = param_getchar(Cmd, 6); transferToEml |= (ctmp == 't' || ctmp == 'T'); transferToEml |= (ctmp == 'd' || ctmp == 'D'); - + if (cmdp == 'o') { PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A'); int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true); @@ -625,12 +624,12 @@ int CmdHF14AMfNested(const char *Cmd) sectortrailer = (trgBlockNo & 0x0f) + 15; } mfEmlGetMem(keyBlock, sectortrailer, 1); - + if (!trgKeyType) num_to_bytes(key64, 6, keyBlock); else num_to_bytes(key64, 6, &keyBlock[10]); - mfEmlSetMem(keyBlock, sectortrailer, 1); + mfEmlSetMem(keyBlock, sectortrailer, 1); } } else { PrintAndLog("No valid key found"); @@ -642,7 +641,7 @@ int CmdHF14AMfNested(const char *Cmd) e_sector = calloc(SectorsCnt, sizeof(sector_t)); if (e_sector == NULL) return 1; - + //test current key and additional standard keys first memcpy(keyBlock, key, 6); num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6)); @@ -663,23 +662,23 @@ int CmdHF14AMfNested(const char *Cmd) for (i = 0; i < SectorsCnt; i++) { for (j = 0; j < 2; j++) { if (e_sector[i].foundKey[j]) continue; - + res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64); - + if (!res) { e_sector[i].Key[j] = key64; e_sector[i].foundKey[j] = 1; } } } - + // nested sectors iterations = 0; PrintAndLog("nested..."); bool calibrate = true; for (i = 0; i < NESTED_SECTOR_RETRY; i++) { for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) { - for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { + for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { if (e_sector[sectorNo].foundKey[trgKeyType]) continue; PrintAndLog("-----------------------------------------------"); int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate); @@ -695,7 +694,7 @@ int CmdHF14AMfNested(const char *Cmd) } else { calibrate = false; } - + iterations++; key64 = bytes_to_num(keyBlock, 6); @@ -709,7 +708,7 @@ int CmdHF14AMfNested(const char *Cmd) } printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0); - + PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations); //print them PrintAndLog("|---|----------------|---|----------------|---|"); @@ -720,7 +719,7 @@ int CmdHF14AMfNested(const char *Cmd) e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]); } PrintAndLog("|---|----------------|---|----------------|---|"); - + // transfer them to the emulator if (transferToEml) { for (i = 0; i < SectorsCnt; i++) { @@ -730,12 +729,12 @@ int CmdHF14AMfNested(const char *Cmd) if (e_sector[i].foundKey[1]) num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]); mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1); - } + } } - + // Create dump file if (createDumpFile) { - if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { + if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(e_sector); return 1; @@ -761,7 +760,7 @@ int CmdHF14AMfNested(const char *Cmd) } fclose(fkeys); } - + free(e_sector); } return 0; @@ -776,7 +775,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) uint8_t trgKeyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0}; - + char ctmp; ctmp = param_getchar(Cmd, 0); @@ -799,15 +798,15 @@ int CmdHF14AMfNestedHard(const char *Cmd) PrintAndLog("Add the known target key to check if it is present in the remaining key space:"); PrintAndLog(" sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF"); return 0; - } - + } + bool know_target_key = false; bool nonce_file_read = false; bool nonce_file_write = false; bool slow = false; int tests = 0; - - + + if (ctmp == 'R' || ctmp == 'r') { nonce_file_read = true; if (!param_gethex(Cmd, 1, trgkey, 12)) { @@ -825,15 +824,15 @@ int CmdHF14AMfNestedHard(const char *Cmd) PrintAndLog("Key type must be A or B"); return 1; } - if (ctmp != 'A' && ctmp != 'a') { + if (ctmp != 'A' && ctmp != 'a') { keyType = 1; } - + if (param_gethex(Cmd, 2, key, 12)) { PrintAndLog("Key must include 12 HEX symbols"); return 1; } - + trgBlockNo = param_get8(Cmd, 3); ctmp = param_getchar(Cmd, 4); if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { @@ -864,8 +863,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) } } - PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", - trgBlockNo, + PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", + trgBlockNo, trgKeyType?'B':'A', trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5], know_target_key?"":" (not set)", @@ -900,14 +899,14 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog(" hf mf chk *1 ? t"); PrintAndLog(" hf mf chk *1 ? d"); return 0; - } + } FILE * f; char filename[FILE_PATH_SIZE]={0}; char buf[13]; uint8_t *keyBlock = NULL, *p; uint16_t stKeyBlock = 20; - + int i, res; int keycnt = 0; char ctmp = 0x00; @@ -915,7 +914,7 @@ int CmdHF14AMfChk(const char *Cmd) uint8_t SectorsCnt = 1; uint8_t keyType = 0; uint64_t key64 = 0; - + int transferToEml = 0; int createDumpFile = 0; @@ -944,7 +943,7 @@ int CmdHF14AMfChk(const char *Cmd) { num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6)); } - + if (param_getchar(Cmd, 0)=='*') { blockNo = 3; switch(param_getchar(Cmd+1, 0)) { @@ -957,9 +956,9 @@ int CmdHF14AMfChk(const char *Cmd) } else blockNo = param_get8(Cmd, 0); - + ctmp = param_getchar(Cmd, 1); - switch (ctmp) { + switch (ctmp) { case 'a': case 'A': keyType = !0; break; @@ -974,11 +973,11 @@ int CmdHF14AMfChk(const char *Cmd) free(keyBlock); return 1; }; - + ctmp = param_getchar(Cmd, 2); if (ctmp == 't' || ctmp == 'T') transferToEml = 1; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1; - + for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) { if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) { if ( stKeyBlock - keycnt < 2) { @@ -1001,21 +1000,21 @@ int CmdHF14AMfChk(const char *Cmd) free(keyBlock); return 2; } - + if ( (f = fopen( filename , "r")) ) { while( fgets(buf, sizeof(buf), f) ){ if (strlen(buf) < 12 || buf[11] == '\n') continue; - + while (fgetc(f) != '\n' && !feof(f)) ; //goto next line - + if( buf[0]=='#' ) continue; //The line start with # is comment, skip if (!isxdigit(buf[0])){ PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf); continue; } - + buf[12] = 0; if ( stKeyBlock - keycnt < 2) { @@ -1039,11 +1038,11 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("File: %s: not found or locked.", filename); free(keyBlock); return 1; - + } } } - + if (keycnt == 0) { PrintAndLog("No key specified, trying default keys"); for (;keycnt < defaultKeysSize; keycnt++) @@ -1051,7 +1050,7 @@ int CmdHF14AMfChk(const char *Cmd) (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2], (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6); } - + // initialize storage for found keys bool validKey[2][40]; uint8_t foundKey[2][40][6]; @@ -1063,7 +1062,7 @@ int CmdHF14AMfChk(const char *Cmd) } } } - + for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) { int b=blockNo; for (int i = 0; i < SectorsCnt; ++i) { @@ -1077,12 +1076,12 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("Found valid key:[%012" PRIx64 "]",key64); num_to_bytes(key64, 6, foundKey[t][i]); validKey[t][i] = true; - } + } } else { PrintAndLog("Command execute timeout"); } } - b<127?(b+=4):(b+=16); + b<127?(b+=4):(b+=16); } } @@ -1104,7 +1103,7 @@ int CmdHF14AMfChk(const char *Cmd) if (createDumpFile) { FILE *fkeys = fopen("dumpkeys.bin","wb"); - if (fkeys == NULL) { + if (fkeys == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(keyBlock); return 1; @@ -1205,11 +1204,11 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack PrintAndLog("block data must include 32 HEX symbols"); return; } - + UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); clearCommandBuffer(); - SendCommand(&c); + SendCommand(&c); } } } @@ -1241,7 +1240,7 @@ int usage_hf14_mf1ksim(void) { PrintAndLog(" hf mf sim u 112233445566778899AA"); PrintAndLog(" hf mf sim f uids.txt"); PrintAndLog(" hf mf sim u 0a0a0a0a e"); - + return 0; } @@ -1344,9 +1343,9 @@ int CmdHF14AMf1kSim(const char *Cmd) { memset(buf, 0, sizeof(buf)); memset(uid, 0, sizeof(uid)); - if (fgets(buf, sizeof(buf), f) == NULL) { + if (fgets(buf, sizeof(buf), f) == NULL) { if (count > 0) break; - + PrintAndLog("File reading error."); fclose(f); return 2; @@ -1358,7 +1357,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { case 20: flags |= FLAG_10B_UID_IN_DATA; break; //not complete case 14: flags |= FLAG_7B_UID_IN_DATA; break; case 8: flags |= FLAG_4B_UID_IN_DATA; break; - default: + default: PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf); fclose(f); return 2; @@ -1367,10 +1366,10 @@ int CmdHF14AMf1kSim(const char *Cmd) { for (uint8_t i = 0; i < uidlen; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]); } - + PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1400,7 +1399,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) ", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1444,7 +1443,7 @@ int CmdHF14AMfDbg(const char *Cmd) PrintAndLog(" 4 - print even debug messages in timing critical functions"); PrintAndLog(" Note: this option therefore may cause malfunction itself"); return 0; - } + } UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}}; SendCommand(&c); @@ -1461,8 +1460,8 @@ int CmdHF14AMfEGet(const char *Cmd) PrintAndLog("Usage: hf mf eget "); PrintAndLog(" sample: hf mf eget 0 "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); PrintAndLog(" "); @@ -1481,7 +1480,7 @@ int CmdHF14AMfEClear(const char *Cmd) PrintAndLog("Usage: hf mf eclr"); PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n"); return 0; - } + } UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}}; SendCommand(&c); @@ -1500,15 +1499,15 @@ int CmdHF14AMfESet(const char *Cmd) PrintAndLog("Usage: hf mf eset "); PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); - + if (param_gethex(Cmd, 1, memBlock, 32)) { PrintAndLog("block data must include 32 HEX symbols"); return 1; } - + // 1 - blocks count UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); @@ -1526,9 +1525,9 @@ int CmdHF14AMfELoad(const char *Cmd) uint8_t buf8[64] = {0x00}; int i, len, blockNum, numBlocks; int nameParamNo = 1; - + char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 0x00) { PrintAndLog("It loads emul dump from the file `filename.eml`"); PrintAndLog("Usage: hf mf eload [card memory] "); @@ -1537,11 +1536,11 @@ int CmdHF14AMfELoad(const char *Cmd) PrintAndLog(" sample: hf mf eload filename"); PrintAndLog(" hf mf eload 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1552,33 +1551,33 @@ int CmdHF14AMfELoad(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File %s not found or locked", filename); return 1; } - + blockNum = 0; while(!feof(f)){ memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { - + if (blockNum >= numBlocks) break; - + PrintAndLog("File reading error."); fclose(f); return 2; } - + if (strlen(buf) < 32){ if(strlen(buf) && feof(f)) break; @@ -1586,11 +1585,11 @@ int CmdHF14AMfELoad(const char *Cmd) fclose(f); return 2; } - + for (i = 0; i < 32; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]); } - + if (mfEmlSetMem(buf8, blockNum, 1)) { PrintAndLog("Cant set emul block: %3d", blockNum); fclose(f); @@ -1598,12 +1597,12 @@ int CmdHF14AMfELoad(const char *Cmd) } printf("."); blockNum++; - + if (blockNum >= numBlocks) break; } fclose(f); printf("\n"); - + if ((blockNum != numBlocks)) { PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks); return 4; @@ -1621,12 +1620,12 @@ int CmdHF14AMfESave(const char *Cmd) uint8_t buf[64]; int i, j, len, numBlocks; int nameParamNo = 1; - + memset(filename, 0, sizeof(filename)); memset(buf, 0, sizeof(buf)); char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 'H') { PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`"); PrintAndLog(" Usage: hf mf esave [card memory] [file name w/o `.eml`]"); @@ -1636,11 +1635,11 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog(" hf mf esave 4"); PrintAndLog(" hf mf esave 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1651,9 +1650,9 @@ int CmdHF14AMfESave(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - + // user supplied filename? if (len < 1) { // get filename (UID from memory) @@ -1671,8 +1670,8 @@ int CmdHF14AMfESave(const char *Cmd) } // add file extension - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -1680,7 +1679,7 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog("Can't open file %s ", filename); return 1; } - + // put hex for (i = 0; i < numBlocks; i++) { if (mfEmlGetMem(buf, i, 1)) { @@ -1688,13 +1687,13 @@ int CmdHF14AMfESave(const char *Cmd) break; } for (j = 0; j < 16; j++) - fprintf(f, "%02X", buf[j]); + fprintf(f, "%02X", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename); - + return 0; } @@ -1703,7 +1702,7 @@ int CmdHF14AMfECFill(const char *Cmd) { uint8_t keyType = 0; uint8_t numSectors = 16; - + if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf ecfill [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -1713,7 +1712,7 @@ int CmdHF14AMfECFill(const char *Cmd) PrintAndLog("Read card and transfer its data to emulator memory."); PrintAndLog("Keys must be laid in the emulator memory. \n"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { @@ -1725,12 +1724,12 @@ int CmdHF14AMfECFill(const char *Cmd) ctmp = param_getchar(Cmd, 1); switch (ctmp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } + } printf("--params: numSectors: %d, keyType:%d", numSectors, keyType); UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}}; @@ -1738,14 +1737,13 @@ int CmdHF14AMfECFill(const char *Cmd) return 0; } - int CmdHF14AMfEKeyPrn(const char *Cmd) { int i; uint8_t numSectors; uint8_t data[16]; uint64_t keyA, keyB; - + if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It prints the keys loaded in the emulator memory"); PrintAndLog("Usage: hf mf ekeyprn [card memory]"); @@ -1753,19 +1751,19 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog(""); PrintAndLog(" sample: hf mf ekeyprn 1"); return 0; - } + } char cmdp = param_getchar(Cmd, 0); - + switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + PrintAndLog("|---|----------------|----------------|"); PrintAndLog("|sec|key A |key B |"); PrintAndLog("|---|----------------|----------------|"); @@ -1779,11 +1777,10 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB); } PrintAndLog("|---|----------------|----------------|"); - + return 0; } - int CmdHF14AMfCSetUID(const char *Cmd) { uint8_t wipeCard = 0; @@ -1847,7 +1844,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) PrintAndLog("Can't set UID. error=%d", res); return 1; } - + PrintAndLog("old UID:%s", sprint_hex(oldUid, 4)); PrintAndLog("new UID:%s", sprint_hex(uid, 4)); return 0; @@ -1858,7 +1855,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd) uint8_t memBlock[16] = {0x00}; uint8_t blockNo = 0; bool wipeCard = false; - int res; + int res, gen = 0; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf csetblk [w]"); @@ -1866,7 +1863,9 @@ int CmdHF14AMfCSetBlk(const char *Cmd) PrintAndLog("Set block data for magic Chinese card (only works with such cards)"); PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line"); return 0; - } + } + + gen = mfCIdentify(); blockNo = param_get8(Cmd, 0); @@ -1879,7 +1878,14 @@ int CmdHF14AMfCSetBlk(const char *Cmd) wipeCard = (ctmp == 'w' || ctmp == 'W'); PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16)); - res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + } + if (res) { PrintAndLog("Can't write block. error=%d", res); return 1; @@ -1893,33 +1899,44 @@ int CmdHF14AMfCLoad(const char *Cmd) FILE * f; char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; - char buf[64] = {0x00}; - uint8_t buf8[64] = {0x00}; + char buf[256] = {0x00}; + uint8_t buf8[256] = {0x00}; uint8_t fillFromEmulator = 0; - int i, len, blockNum, flags=0; - + int i, len, blockNum, flags = 0, gen = 0, numblock = 64; + if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) { PrintAndLog("It loads magic Chinese card from the file `filename.eml`"); - PrintAndLog("or from emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf cload "); - PrintAndLog(" or: hf mf cload e "); - PrintAndLog(" sample: hf mf cload filename"); + PrintAndLog("or from emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf cload [file name w/o `.eml`][e][4]"); + PrintAndLog(" or: hf mf cload e [4]"); + PrintAndLog("Sample: hf mf cload filename"); + PrintAndLog(" hf mf cload filname 4"); + PrintAndLog(" hf mf cload e"); + PrintAndLog(" hf mf cload e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; - + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Loading magic mifare %dK", numblock == 256 ? 4:1); + if (fillFromEmulator) { - for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) { + for (blockNum = 0; blockNum < numblock; blockNum += 1) { if (mfEmlGetMem(buf8, blockNum, 1)) { PrintAndLog("Cant get block: %d", blockNum); return 2; } if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Cant set magic card block: %d", blockNum); return 3; @@ -1927,26 +1944,28 @@ int CmdHF14AMfCLoad(const char *Cmd) } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File not found or locked."); return 1; } - + blockNum = 0; while(!feof(f)){ - + memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { fclose(f); PrintAndLog("File reading error."); @@ -1965,21 +1984,25 @@ int CmdHF14AMfCLoad(const char *Cmd) if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Can't set magic card block: %d", blockNum); fclose(f); return 3; } blockNum++; - - if (blockNum >= 16 * 4) break; // magic card type - mifare 1K + + if (blockNum >= numblock) break; // magic card type - mifare 1K 64 blocks, mifare 4k 256 blocks } fclose(f); - - if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ - PrintAndLog("File content error. There must be 64 blocks"); + + //if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ + if (blockNum != numblock){ + PrintAndLog("File content error. There must be %d blocks", numblock); return 4; } PrintAndLog("Loaded from file: %s", filename); @@ -1991,7 +2014,7 @@ int CmdHF14AMfCLoad(const char *Cmd) int CmdHF14AMfCGetBlk(const char *Cmd) { uint8_t memBlock[16]; uint8_t blockNo = 0; - int res; + int res, gen = 0; memset(memBlock, 0x00, sizeof(memBlock)); if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { @@ -1999,55 +2022,77 @@ int CmdHF14AMfCGetBlk(const char *Cmd) { PrintAndLog("sample: hf mf cgetblk 1"); PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n"); return 0; - } + } + + gen = mfCIdentify(); blockNo = param_get8(Cmd, 0); PrintAndLog("--block number:%2d ", blockNo); - res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + } if (res) { PrintAndLog("Can't read block. error=%d", res); return 1; } - + PrintAndLog("block data:%s", sprint_hex(memBlock, 16)); return 0; } - int CmdHF14AMfCGetSc(const char *Cmd) { uint8_t memBlock[16] = {0x00}; uint8_t sectorNo = 0; - int i, res, flags; + int i, res, flags, gen = 0, baseblock = 0, sect_size = 4; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf cgetsc "); PrintAndLog("sample: hf mf cgetsc 0"); PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n"); return 0; - } + } sectorNo = param_get8(Cmd, 0); - if (sectorNo > 15) { - PrintAndLog("Sector number must be in [0..15] as in MIFARE classic."); + + if (sectorNo > 39) { + PrintAndLog("Sector number must be in [0..15] in MIFARE classic 1k and [0..39] in MIFARE classic 4k."); return 1; } PrintAndLog("--sector number:%d ", sectorNo); + gen = mfCIdentify(); + flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 4; i++) { + if (sectorNo < 32 ) { + baseblock = sectorNo * 4; + } else { + baseblock = 128 + 16 * (sectorNo - 32); + + } + if (sectorNo > 31) sect_size = 16; + + for (i = 0; i < sect_size; i++) { if (i == 1) flags = 0; - if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + if (i == sect_size - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags); + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + + res = mfCGetBlock(baseblock + i, memBlock, flags); if (res) { - PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res); + PrintAndLog("Can't read block. %d error=%d", baseblock + i, res); return 1; } - - PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16)); + + PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16)); } return 0; } @@ -2059,37 +2104,50 @@ int CmdHF14AMfCSave(const char *Cmd) { char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; uint8_t fillFromEmulator = 0; - uint8_t buf[64] = {0x00}; - int i, j, len, flags; - + uint8_t buf[256] = {0x00}; + int i, j, len, flags, gen = 0, numblock = 64; + // memset(filename, 0, sizeof(filename)); // memset(buf, 0, sizeof(buf)); if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`"); - PrintAndLog("or into emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e]"); - PrintAndLog(" sample: hf mf esave "); - PrintAndLog(" hf mf esave filename"); - PrintAndLog(" hf mf esave e \n"); + PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e][4]"); + PrintAndLog("Sample: hf mf esave "); + PrintAndLog(" hf mf esave filename"); + PrintAndLog(" hf mf esave e"); + PrintAndLog(" hf mf esave 4"); + PrintAndLog(" hf mf esave filename 4"); + PrintAndLog(" hf mf esave e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; + if (ctmp == '4') numblock = 256; + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Saving magic mifare %dK", numblock == 256 ? 4:1); if (fillFromEmulator) { // put into emulator flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } - + if (mfEmlSetMem(buf, i, 1)) { PrintAndLog("Cant set emul block: %d", i); return 3; @@ -2097,27 +2155,35 @@ int CmdHF14AMfCSave(const char *Cmd) { } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - - if (len < 1) { + + ctmp = param_getchar(Cmd, 0); + if (len < 1 || (ctmp == '4')) { // get filename - if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) { + + flags = CSETBLOCK_SINGLE_OPER; + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(0, buf, flags)) { PrintAndLog("Cant get block: %d", 0); len = sprintf(fnameptr, "dump"); fnameptr += len; } else { for (j = 0; j < 7; j++, fnameptr += 2) - sprintf(fnameptr, "%02x", buf[j]); + sprintf(fnameptr, "%02x", buf[j]); } } else { - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; } - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -2128,22 +2194,25 @@ int CmdHF14AMfCSave(const char *Cmd) { // put hex flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } for (j = 0; j < 16; j++) - fprintf(f, "%02x", buf[j]); + fprintf(f, "%02x", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved to file: %s", filename); - + return 0; } } @@ -2156,7 +2225,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //bool wantSaveToEml = 0; TODO bool wantSaveToEmlFile = 0; - //var + //var int res = 0; int len = 0; int blockLen = 0; @@ -2170,7 +2239,7 @@ int CmdHF14AMfSniff(const char *Cmd){ uint8_t *buf = NULL; uint16_t bufsize = 0; uint8_t *bufPtr = NULL; - + char ctmp = param_getchar(Cmd, 0); if ( ctmp == 'h' || ctmp == 'H' ) { PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file."); @@ -2182,8 +2251,8 @@ int CmdHF14AMfSniff(const char *Cmd){ PrintAndLog("Usage: hf mf sniff [l][d][e][f]"); PrintAndLog(" sample: hf mf sniff l d e"); return 0; - } - + } + for (int i = 0; i < 4; i++) { ctmp = param_getchar(Cmd, i); if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true; @@ -2191,7 +2260,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true; } - + printf("-------------------------------------------------------------------------\n"); printf("Executing command. \n"); printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n"); @@ -2211,7 +2280,7 @@ int CmdHF14AMfSniff(const char *Cmd){ printf("\naborted via keyboard!\n"); break; } - + UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) { res = resp.arg[0] & 0xff; @@ -2268,24 +2337,24 @@ int CmdHF14AMfSniff(const char *Cmd){ memcpy(atqa, bufPtr + 2 + 7, 2); uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4; sak = bufPtr[11]; - PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", + PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", sprint_hex(uid + (7 - uid_len), uid_len), - atqa[1], - atqa[0], + atqa[1], + atqa[0], sak); if (wantLogToFile || wantDecrypt) { FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len); AddLogCurrentDT(logHexFileName); - } - if (wantDecrypt) + } + if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile); } else { PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len)); - if (wantLogToFile) + if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len); - if (wantDecrypt) + if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile); - num++; + num++; } bufPtr += len; bufPtr += ((len-1)/8+1); // ignore parity diff --git a/client/mifarehost.c b/client/mifarehost.c index 6b5e3ba2..3b524758 100644 --- a/client/mifarehost.c +++ b/client/mifarehost.c @@ -11,7 +11,7 @@ #include "mifarehost.h" #include -#include +#include #include #include @@ -23,6 +23,8 @@ #include "util.h" #include "iso14443crc.h" +#include "mifare.h" + // mifare tracer flags used in mfTraceDecode() #define TRACE_IDLE 0x00 #define TRACE_AUTH1 0x01 @@ -52,7 +54,7 @@ static uint32_t intersection(uint64_t *list1, uint64_t *list2) return 0; } uint64_t *p1, *p2, *p3; - p1 = p3 = list1; + p1 = p3 = list1; p2 = list2; while ( *p1 != -1 && *p2 != -1 ) { @@ -98,7 +100,7 @@ static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_i } keylist = (uint64_t*)states; - + for (i = 0; keylist[i]; i++) { lfsr_rollback_word(states+i, uid^nt, 0); crypto1_get_lfsr(states+i, &key_recovered); @@ -128,16 +130,16 @@ int mfDarkside(uint64_t *key) printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n"); printf("-------------------------------------------------------------------------\n"); - + while (true) { clearCommandBuffer(); SendCommand(&c); - + //flush queue while (ukbhit()) { int c = getchar(); (void) c; } - + // wait cycle while (true) { printf("."); @@ -146,7 +148,7 @@ int mfDarkside(uint64_t *key) return -5; break; } - + UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { isOK = resp.arg[0]; @@ -160,7 +162,7 @@ int mfDarkside(uint64_t *key) nr = bytes_to_num(resp.d.asBytes + 24, 4); break; } - } + } if (par_list == 0 && c.arg[0] == true) { PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication."); @@ -171,7 +173,7 @@ int mfDarkside(uint64_t *key) keycount = nonce2key(uid, nt, nr, par_list, ks_list, &keylist); if (keycount == 0) { - PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); + PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); PrintAndLog("This is expected to happen in 25%% of all cases. Trying again with a different reader nonce..."); continue; } @@ -188,7 +190,7 @@ int mfDarkside(uint64_t *key) PrintAndLog("Found %u possible keys. Trying to authenticate with each of them ...\n", keycount); } else { PrintAndLog("Found a possible key. Trying to authenticate...\n"); - } + } *key = -1; uint8_t keyBlock[USB_CMD_DATA_SIZE]; @@ -205,8 +207,8 @@ int mfDarkside(uint64_t *key) if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) { break; } - } - + } + if (*key != -1) { free(last_keylist); free(keylist); @@ -217,7 +219,7 @@ int mfDarkside(uint64_t *key) last_keylist = keylist; } } - + return 0; } @@ -244,7 +246,7 @@ int Compare16Bits(const void * a, const void * b) { else return -1; } -typedef +typedef struct { union { struct Crypto1State *slhead; @@ -274,11 +276,11 @@ void* nested_worker_thread(void *arg) statelist->len = p1 - statelist->head.slhead; statelist->tail.sltail = --p1; qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits); - + return statelist->head.slhead; } -int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) +int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) { uint16_t i; uint32_t uid; @@ -286,10 +288,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, StateList_t statelists[2]; struct Crypto1State *p1, *p2, *p3, *p4; - + // flush queue WaitForResponseTimeout(CMD_ACK, NULL, 100); - + UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -301,10 +303,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, if (resp.arg[0]) { return resp.arg[0]; // error during nested } - + memcpy(&uid, resp.d.asBytes, 4); PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8); - + for (i = 0; i < 2; i++) { statelists[i].blockNo = resp.arg[2] & 0xff; statelists[i].keyType = (resp.arg[2] >> 8) & 0xff; @@ -312,16 +314,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4); memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4); } - + // calc keys - + pthread_t thread_id[2]; - + // create and run worker threads for (i = 0; i < 2; i++) { pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]); } - + // wait for threads to terminate: for (i = 0; i < 2; i++) { pthread_join(thread_id[i], (void*)&statelists[i].head.slhead); @@ -331,7 +333,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, // the first 16 Bits of the cryptostate already contain part of our key. // Create the intersection of the two lists based on these 16 Bits and // roll back the cryptostate - p1 = p3 = statelists[0].head.slhead; + p1 = p3 = statelists[0].head.slhead; p2 = p4 = statelists[1].head.slhead; while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) { if (Compare16Bits(p1, p2) == 0) { @@ -382,10 +384,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, break; } } - + free(statelists[0].head.slhead); free(statelists[1].head.slhead); - + return 0; } @@ -403,7 +405,7 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) { int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) { UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}}; - memcpy(c.d.asBytes, data, blocksCount * 16); + memcpy(c.d.asBytes, data, blocksCount * 16); SendCommand(&c); return 0; } @@ -432,15 +434,15 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin uint8_t isOK = 0; UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}}; - memcpy(c.d.asBytes, data, 16); + memcpy(c.d.asBytes, data, 16); SendCommand(&c); UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) { isOK = resp.arg[0] & 0xff; - if (uid != NULL) + if (uid != NULL) memcpy(uid, resp.d.asBytes, 4); - if (!isOK) + if (!isOK) return 2; } else { PrintAndLog("Command execute timeout"); @@ -452,8 +454,18 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) { uint8_t oldblock0[16] = {0x00}; uint8_t block0[16] = {0x00}; + int old, gen = 0; + + gen = mfCIdentify(); + + if (gen == 2) { + /* generation 1b magic card */ + old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER); + } - int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER); if (old == 0) { memcpy(block0, oldblock0, 16); PrintAndLog("old block 0: %s", sprint_hex(block0,16)); @@ -463,7 +475,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w // fill in the new values // UID - memcpy(block0, uid, 4); + memcpy(block0, uid, 4); // Mifare UID BCC block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed) @@ -474,7 +486,14 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w block0[7]=atqa[0]; } PrintAndLog("new block 0: %s", sprint_hex(block0,16)); - return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER); + + if (gen == 2) { + /* generation 1b magic card */ + return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER); + } } // SNIFFER @@ -508,7 +527,7 @@ int isTraceCardEmpty(void) { } int isBlockEmpty(int blockN) { - for (int i = 0; i < 16; i++) + for (int i = 0; i < 16; i++) if (traceCard[blockN * 16 + i] != 0) return 0; return 1; @@ -520,15 +539,15 @@ int isBlockTrailer(int blockN) { int saveTraceCard(void) { FILE * f; - + if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0; - + f = fopen(traceFileName, "w+"); if ( !f ) return 1; - + for (int i = 0; i < 64; i++) { // blocks for (int j = 0; j < 16; j++) // bytes - fprintf(f, "%02x", *(traceCard + i * 16 + j)); + fprintf(f, "%02x", *(traceCard + i * 16 + j)); fprintf(f,"\n"); } fclose(f); @@ -540,10 +559,10 @@ int loadTraceCard(uint8_t *tuid) { char buf[64] = {0x00}; uint8_t buf8[64] = {0x00}; int i, blockNum; - - if (!isTraceCardEmpty()) + + if (!isTraceCardEmpty()) saveTraceCard(); - + memset(traceCard, 0x00, 4096); memcpy(traceCard, tuid + 3, 4); @@ -551,11 +570,11 @@ int loadTraceCard(uint8_t *tuid) { f = fopen(traceFileName, "r"); if (!f) return 1; - + blockNum = 0; - + while(!feof(f)){ - + memset(buf, 0, sizeof(buf)); if (fgets(buf, sizeof(buf), f) == NULL) { PrintAndLog("File reading error."); @@ -583,20 +602,20 @@ int loadTraceCard(uint8_t *tuid) { int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) { - if (traceCrypto1) + if (traceCrypto1) crypto1_destroy(traceCrypto1); traceCrypto1 = NULL; - if (wantSaveToEmlFile) + if (wantSaveToEmlFile) loadTraceCard(tuid); - + traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3]; traceCard[5] = sak; memcpy(&traceCard[6], atqa, 2); traceCurBlock = 0; uid = bytes_to_num(tuid + 3, 4); - + traceState = TRACE_IDLE; return 0; @@ -605,7 +624,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){ uint8_t bt = 0; int i; - + if (len != 1) { for (i = 0; i < len; i++) data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i]; @@ -613,7 +632,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i bt = 0; for (i = 0; i < 4; i++) bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], i)) << i; - + data[0] = bt; } return; @@ -628,24 +647,24 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; return 1; } - + memcpy(data, data_src, len); if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) { mf_crypto1_decrypt(traceCrypto1, data, len, 0); PrintAndLog("dec> %s", sprint_hex(data, len)); - AddLogHex(logHexFileName, "dec> ", data, len); + AddLogHex(logHexFileName, "dec> ", data, len); } - + switch (traceState) { - case TRACE_IDLE: + case TRACE_IDLE: // check packet crc16! if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) { PrintAndLog("dec> CRC ERROR!!!"); - AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); + AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); traceState = TRACE_ERROR; // do not decrypt the next commands return 1; } - + // AUTHENTICATION if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) { traceState = TRACE_AUTH1; @@ -673,11 +692,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; // do not decrypt the next commands return 0; } - + return 0; break; - - case TRACE_READ_DATA: + + case TRACE_READ_DATA: if (len == 18) { traceState = TRACE_IDLE; @@ -694,7 +713,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - case TRACE_WRITE_OK: + case TRACE_WRITE_OK: if ((len == 1) && (data[0] == 0x0a)) { traceState = TRACE_WRITE_DATA; @@ -705,7 +724,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - case TRACE_WRITE_DATA: + case TRACE_WRITE_DATA: if (len == 18) { traceState = TRACE_IDLE; @@ -718,7 +737,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - case TRACE_AUTH1: + case TRACE_AUTH1: if (len == 4) { traceState = TRACE_AUTH2; nt = bytes_to_num(data, 4); @@ -729,7 +748,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - case TRACE_AUTH2: + case TRACE_AUTH2: if (len == 8) { traceState = TRACE_AUTH_OK; @@ -742,12 +761,12 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - case TRACE_AUTH_OK: + case TRACE_AUTH_OK: if (len ==4) { traceState = TRACE_IDLE; at_enc = bytes_to_num(data, 4); - + // decode key here) ks2 = ar_enc ^ prng_successor(nt, 64); ks3 = at_enc ^ prng_successor(nt, 96); @@ -759,11 +778,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { crypto1_get_lfsr(revstate, &lfsr); printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF)); - AddLogUint64(logHexFileName, "key> ", lfsr); - + AddLogUint64(logHexFileName, "key> ", lfsr); + int blockShift = ((traceCurBlock & 0xFC) + 3) * 16; if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4); - + if (traceCurKey) { num_to_bytes(lfsr, 6, traceCard + blockShift + 10); } else { @@ -774,10 +793,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { if (traceCrypto1) { crypto1_destroy(traceCrypto1); } - + // set cryptosystem state traceCrypto1 = lfsr_recovery64(ks2, ks3); - + // nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt; /* traceCrypto1 = crypto1_create(lfsr); // key in lfsr @@ -785,7 +804,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { crypto1_word(traceCrypto1, ar, 1); crypto1_word(traceCrypto1, 0, 0); crypto1_word(traceCrypto1, 0, 0);*/ - + return 0; } else { traceState = TRACE_ERROR; @@ -793,7 +812,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } break; - default: + default: traceState = TRACE_ERROR; return 1; } @@ -820,3 +839,50 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, crypto1_destroy(traceCrypto1); return 0; } + +int mfCIdentify() +{ + UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; + SendCommand(&c); + + UsbCommand resp; + WaitForResponse(CMD_ACK,&resp); + + iso14a_card_select_t card; + memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t)); + + uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision + + if(select_status != 0) { + uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0 + c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT; + c.arg[1] = 2; + c.arg[2] = 0; + memcpy(c.d.asBytes, rats, 2); + SendCommand(&c); + WaitForResponse(CMD_ACK,&resp); + } + + c.cmd = CMD_MIFARE_CIDENT; + c.arg[0] = 0; + c.arg[1] = 0; + c.arg[2] = 0; + SendCommand(&c); + WaitForResponse(CMD_ACK,&resp); + + uint8_t isGeneration = resp.arg[0] & 0xff; + switch( isGeneration ){ + case 1: PrintAndLog("Chinese magic backdoor commands (GEN 1a) detected"); break; + case 2: PrintAndLog("Chinese magic backdoor command (GEN 1b) detected"); break; + default: PrintAndLog("No chinese magic backdoor command detected"); break; + } + + // disconnect + c.cmd = CMD_READER_ISO_14443a; + c.arg[0] = 0; + c.arg[1] = 0; + c.arg[2] = 0; + SendCommand(&c); + + return (int) isGeneration; +} diff --git a/client/mifarehost.h b/client/mifarehost.h index c5644442..7f9a2b45 100644 --- a/client/mifarehost.h +++ b/client/mifarehost.h @@ -16,12 +16,13 @@ #include "data.h" // mfCSetBlock work flags -#define CSETBLOCK_UID 0x01 -#define CSETBLOCK_WUPC 0x02 -#define CSETBLOCK_HALT 0x04 +#define CSETBLOCK_UID 0x01 +#define CSETBLOCK_WUPC 0x02 +#define CSETBLOCK_HALT 0x04 #define CSETBLOCK_INIT_FIELD 0x08 #define CSETBLOCK_RESET_FIELD 0x10 #define CSETBLOCK_SINGLE_OPER 0x1F +#define CSETBLOCK_MAGIC_1B 0x40 extern char logHexFileName[FILE_PATH_SIZE]; @@ -46,4 +47,6 @@ extern int loadTraceCard(uint8_t *tuid); extern int saveTraceCard(void); extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len); +extern int mfCIdentify(); + #endif