X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..8fd0a564e571f0cefdb77b1da6774e6ad981dcef:/client/cmdhfmfu.c diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 07609339..336fd64a 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -41,20 +41,9 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = { { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF } // 11 22 33 }; -#define KEYS_PWD_COUNT 10 +#define KEYS_PWD_COUNT 1 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = { {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default - - {0x4A,0xF8,0x4B,0x19}, // PACK 0xE5,0xBE -- italian bus (sniffed) - {0x33,0x6B,0xA1,0x19}, // PACK 0x9c,0x2d -- italian bus (sniffed) - {0xFF,0x90,0x6C,0xB2}, // PACK 0x12,0x9e -- italian bus (sniffed) - {0x46,0x1c,0xA3,0x19}, // PACK 0xE9,0x5A -- italian bus (sniffed) - {0x35,0x1C,0xD0,0x19}, // PACK 0x9A,0x5a -- italian bus (sniffed) - - {0x05,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- Amiiboo (sniffed) pikachu-b UID: - {0x7E,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- AMiiboo (sniffed) - {0x02,0xE1,0xEE,0x36}, // PACK 0x80,0x80 -- AMiiboo (sniffed) sonic UID: 04d257 7ae33e8027 - {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) }; #define MAX_UL_TYPES 18 @@ -74,6 +63,90 @@ uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = { MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS}; +// Certain pwd generation algo nickname A. +uint32_t ul_ev1_pwdgenA(uint8_t* uid) { + + uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32; + + uint32_t xortable[] = { + 0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3, + 0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7, + 0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC, + 0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0 + }; + + uint8_t entry[] = {0x00,0x00,0x00,0x00}; + uint8_t pwd[] = {0x00,0x00,0x00,0x00}; + + num_to_bytes( xortable[pos], 4, entry); + + pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3]; + pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4]; + pwd[2] = entry[2] ^ uid[0] ^ uid[1] ^ uid[5]; + pwd[3] = entry[3] ^ uid[6]; + + return (uint32_t)bytes_to_num(pwd, 4); +} + +// Certain pwd generation algo nickname B. (very simple) +uint32_t ul_ev1_pwdgenB(uint8_t* uid) { + + uint8_t pwd[] = {0x00,0x00,0x00,0x00}; + + pwd[0] = uid[1] ^ uid[3] ^ 0xAA; + pwd[1] = uid[2] ^ uid[4] ^ 0x55; + pwd[2] = uid[3] ^ uid[5] ^ 0xAA; + pwd[3] = uid[4] ^ uid[6] ^ 0x55; + return (uint32_t)bytes_to_num(pwd, 4); +} + +// Certain pwd generation algo nickname C. +uint32_t ul_ev1_pwdgenC(uint8_t* uid){ + uint32_t pwd = 0; + uint8_t base[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28, + 0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47, + 0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa + }; + + memcpy(base, uid, 7); + + for (int i = 0; i < 32; i += 4) { + uint32_t b = *(uint32_t *)(base + i); + pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd; + } + return BSWAP_32(pwd); +} + +// pack generation for algo 1-3 +uint16_t ul_ev1_packgenA(uint8_t* uid){ + uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8); + return pack; +} +uint16_t ul_ev1_packgenB(uint8_t* uid){ + return 0x8080; +} +uint16_t ul_ev1_packgenC(uint8_t* uid){ + return 0xaa55; +} + + +void ul_ev1_pwdgen_selftest(){ + + uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10}; + uint32_t pwd1 = ul_ev1_pwdgenA(uid1); + PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-"); + + uint8_t uid2[] = {0x04,0x1f,0x98,0xea,0x1e,0x3e,0x81}; + uint32_t pwd2 = ul_ev1_pwdgenB(uid2); + PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--"); + + uint8_t uid3[] = {0x04,0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80}; + uint32_t pwd3 = ul_ev1_pwdgenC(uid3); + PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--"); + return; +} static int CmdHelp(const char *Cmd); @@ -220,7 +293,7 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool if ( !ul_select(card) ) return 0; if (hasAuthKey) { - if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 1) { + if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 2) { ul_switch_off_field(); PrintAndLog("Error: Authentication Failed UL-EV1/NTAG"); return 0; @@ -237,16 +310,6 @@ static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){ return len; } -// static int ulev1_fastRead( uint8_t startblock, uint8_t endblock, uint8_t *response ){ - - // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock}; - - // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){ - // return -1; - // } - // return 0; -// } - static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){ uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter}; @@ -268,7 +331,6 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){ return len; } - // Fudan check checks for which error is given for a command with incorrect crc // NXP UL chip responds with 01, fudan 00. // other possible checks: @@ -338,12 +400,12 @@ static int ul_print_default( uint8_t *data){ PrintAndLog(" Lock : %s - %s", sprint_hex(data+10, 2), - printBits(2, data+10) + sprint_bin(data+10, 2) ); PrintAndLog("OneTimePad : %s - %s\n", sprint_hex(data + 12, 4), - printBits(4, data+12) + sprint_bin(data+12, 4) ); return 0; @@ -434,8 +496,8 @@ static int ulc_print_3deskey( uint8_t *data){ static int ulc_print_configuration( uint8_t *data){ PrintAndLog("--- UL-C Configuration"); - PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), printBits(2, data)); - PrintAndLog(" Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), printBits(2, data+4)); + PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2)); + PrintAndLog(" Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2)); bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30); if ( validAuth ) @@ -460,6 +522,8 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){ bool strg_mod_en = (data[0] & 2); uint8_t authlim = (data[4] & 0x07); + bool nfc_cnf_en = (data[4] & 0x08); + bool nfc_cnf_prot_pwd = (data[4] & 0x10); bool cfglck = (data[4] & 0x40); bool prot = (data[4] & 0x80); uint8_t vctid = data[5]; @@ -475,6 +539,10 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){ PrintAndLog(" - Unlimited password attempts"); else PrintAndLog(" - Max number of password attempts is %d", authlim); + + PrintAndLog(" - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled"); + PrintAndLog(" - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled"); + PrintAndLog(" - user configuration %s", cfglck ? "permanently locked":"writeable"); PrintAndLog(" - %s access is protected with password", prot ? "read and write":"write"); PrintAndLog(" - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not"); @@ -686,7 +754,8 @@ int CmdHF14AMfUInfo(const char *Cmd){ uint8_t dataLen = 0; uint8_t authenticationkey[16] = {0x00}; uint8_t *authkeyptr = authenticationkey; - uint8_t *key; + uint8_t pwd[4] = {0,0,0,0}; + uint8_t *key = pwd; uint8_t pack[4] = {0,0,0,0}; int len = 0; char tempStr[50]; @@ -866,6 +935,31 @@ int CmdHF14AMfUInfo(const char *Cmd){ if ( !authlim && !hasAuthKey ) { PrintAndLog("\n--- Known EV1/NTAG passwords."); len = 0; + + // test pwd gen A + num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key); + len = ulev1_requestAuthentication(key, pack, sizeof(pack)); + if (len >= 1) { + PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]); + } + if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1; + + // test pwd gen B + num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key); + len = ulev1_requestAuthentication(key, pack, sizeof(pack)); + if (len >= 1) { + PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]); + } + if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1; + + // test pwd gen C + num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key); + len = ulev1_requestAuthentication(key, pack, sizeof(pack)); + if (len >= 1) { + PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]); + } + if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1; + for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) { key = default_pwd_pack[i]; len = ulev1_requestAuthentication(key, pack, sizeof(pack)); @@ -1153,14 +1247,13 @@ int usage_hf_mfu_dump(void) { PrintAndLog("NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216"); PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`"); PrintAndLog("It autodetects card type.\n"); - PrintAndLog("Usage: hf mfu dump k l n "); - PrintAndLog(" Options : "); + PrintAndLog("Usage: hf mfu dump k l n p q <#pages>"); + PrintAndLog(" Options :"); PrintAndLog(" k : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]"); PrintAndLog(" l : (optional) swap entered key's endianness"); PrintAndLog(" n : filename w/o .bin to save the dump as"); PrintAndLog(" p : starting Page number to manually set a page to start the dump at"); PrintAndLog(" q : number of Pages to manually set how many pages to dump"); - PrintAndLog(""); PrintAndLog(" sample : hf mfu dump"); PrintAndLog(" : hf mfu dump n myfile"); @@ -1198,14 +1291,31 @@ int usage_hf_mfu_wrbl(void) { } int usage_hf_mfu_eload(void) { - PrintAndLog("It loads emulator dump from the file `filename.eml`\n"); - PrintAndLog("Usage: hf mfu eload t i \n"); - PrintAndLog(" Options:"); - PrintAndLog(" t : Tag memorysize/type"); - PrintAndLog(" i : file name w/o `.eml`"); + PrintAndLog("It loads emul dump from the file `filename.eml`"); + PrintAndLog("Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml"); + PrintAndLog("Usage: hf mfu eload u [numblocks]"); + PrintAndLog(" Options:"); + PrintAndLog(" h : this help"); + PrintAndLog(" u : UL (required)"); + PrintAndLog(" [filename] : without `.eml` (required)"); + PrintAndLog(" numblocks : number of blocks to load from eml file (optional)"); PrintAndLog(""); - PrintAndLog(" sample : hf mfu eload filename"); - PrintAndLog(" : hf mfu eload 4 filename"); + PrintAndLog(" sample: hf mfu eload u filename"); + PrintAndLog(" hf mfu eload u filename 57"); + return 0; +} + +int usage_hf_mfu_sim(void) { + PrintAndLog("\nEmulating Ultralight tag from emulator memory\n"); + PrintAndLog("\nBe sure to load the emulator memory first!\n"); + PrintAndLog("Usage: hf mfu sim t 7 u "); + PrintAndLog(" Options:"); + PrintAndLog(" h : this help"); + PrintAndLog(" t 7 : 7 = NTAG or Ultralight sim (required)"); + PrintAndLog(" u : 4 or 7 byte UID (optional)"); + PrintAndLog("\n sample : hf mfu sim t 7"); + PrintAndLog(" : hf mfu sim t 7 u 1122344556677\n"); + return 0; } @@ -1250,8 +1360,16 @@ int usage_hf_mfu_gendiverse(void){ return 0; } -// +int usage_hf_mfu_pwdgen(void){ + PrintAndLog("Usage: hf mfu pwdgen "); + PrintAndLog(""); + PrintAndLog("sample: hf mfu pwdgen 11223344556677"); + PrintAndLog(""); + return 0; +} +#define DUMP_PREFIX_LENGTH 48 +// // Mifare Ultralight / Ultralight-C / Ultralight-EV1 // Read and Dump Card Contents, using auto detection of tag size. int CmdHF14AMfUDump(const char *Cmd){ @@ -1273,6 +1391,7 @@ int CmdHF14AMfUDump(const char *Cmd){ uint8_t dataLen = 0; uint8_t cmdp = 0; uint8_t authenticationkey[16] = {0x00}; + memset(authenticationkey, 0x00, sizeof(authenticationkey)); uint8_t *authKeyPtr = authenticationkey; size_t fileNlen = 0; bool errors = false; @@ -1314,7 +1433,7 @@ int CmdHF14AMfUDump(const char *Cmd){ cmdp += 2; break; case 'p': - case 'P': + case 'P': //set start page startPage = param_get8(Cmd, cmdp+1); manualPages = true; cmdp += 2; @@ -1336,6 +1455,7 @@ int CmdHF14AMfUDump(const char *Cmd){ //Validations if(errors) return usage_hf_mfu_dump(); + //if we entered a key in little endian and set the swapEndian switch - switch it... if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4); @@ -1402,8 +1522,51 @@ int CmdHF14AMfUDump(const char *Cmd){ } } - // add keys to block dump + uint8_t get_pack[] = {0,0}; + iso14a_card_select_t card; + uint8_t dump_file_data[1024+DUMP_PREFIX_LENGTH] = {0x00}; + uint8_t get_version[] = {0,0,0,0,0,0,0,0,0}; + uint8_t get_tearing[] = {0,0,0}; + uint8_t get_counter[] = {0,0,0}; + uint8_t dummy_pack[] = {0,0}; + uint8_t get_signature[32]; + memset( get_signature, 0, sizeof(get_signature) ); + + // not ul_c and not std ul then attempt to get deeper info + if (!(tagtype & UL_C || tagtype & UL)) { + //attempt to read pack + if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) { + //reset pack + get_pack[0]=0; + get_pack[1]=0; + } + ul_switch_off_field(); + // add pack to block read + memcpy(data + (Pages*4) - 4, get_pack, sizeof(get_pack)); + if ( hasAuthKey ) + ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack)); + else + ul_select(&card); + + ulev1_getVersion( get_version, sizeof(get_version) ); + for ( uint8_t i = 0; i<3; ++i) { + ulev1_readTearing(i, get_tearing+i, 1); + ulev1_readCounter(i, get_counter, sizeof(get_counter) ); + } + ul_switch_off_field(); + if ( hasAuthKey ) + ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack)); + else + ul_select(&card); + ulev1_readSignature( get_signature, sizeof(get_signature)); + ul_switch_off_field(); + } + + // format and add keys to block dump output if (hasAuthKey) { + // if we didn't swapendian before - do it now for the sprint_hex call + // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian + // need to swap to keep it the same if (!swapEndian){ authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4); } else { @@ -1418,11 +1581,40 @@ int CmdHF14AMfUDump(const char *Cmd){ } } + //add *special* blocks to dump + //get version + memcpy(dump_file_data, get_version, sizeof(get_version)); + //tearing + memcpy(dump_file_data+10, get_tearing, sizeof(get_tearing)); + //pack + memcpy(dump_file_data+13, get_pack, sizeof(get_pack)); + //signature + memcpy(dump_file_data+16, get_signature, sizeof(get_signature)); + //add regular block read data to dump + memcpy(dump_file_data+DUMP_PREFIX_LENGTH, data, Pages*4); + + PrintAndLog("\n*Special* block data:"); + PrintAndLog("\nDataType| Data | | Ascii"); + PrintAndLog("---------------------------------"); + PrintAndLog("GetVer-1| %s| | %.4s", sprint_hex(dump_file_data, 4), dump_file_data); + PrintAndLog("GetVer-2| %s| | %.4s", sprint_hex(dump_file_data+4, 4), dump_file_data+4); + PrintAndLog("TBD | 00 00 | | "); + PrintAndLog("Tearing | %s| | %.3s", sprint_hex(dump_file_data+10, 3), dump_file_data+10); + PrintAndLog("Pack | %s | | %.2s", sprint_hex(dump_file_data+13, 2), dump_file_data+13); + PrintAndLog("TBD | 00 | | "); + PrintAndLog("Sig-1 | %s| | %.4s", sprint_hex(dump_file_data+16, 4), dump_file_data+16); + PrintAndLog("Sig-2 | %s| | %.4s", sprint_hex(dump_file_data+20, 4), dump_file_data+20); + PrintAndLog("Sig-3 | %s| | %.4s", sprint_hex(dump_file_data+24, 4), dump_file_data+24); + PrintAndLog("Sig-4 | %s| | %.4s", sprint_hex(dump_file_data+28, 4), dump_file_data+28); + PrintAndLog("Sig-5 | %s| | %.4s", sprint_hex(dump_file_data+32, 4), dump_file_data+32); + PrintAndLog("Sig-6 | %s| | %.4s", sprint_hex(dump_file_data+36, 4), dump_file_data+36); + PrintAndLog("Sig-7 | %s| | %.4s", sprint_hex(dump_file_data+40, 4), dump_file_data+40); + PrintAndLog("Sig-8 | %s| | %.4s", sprint_hex(dump_file_data+44, 4), dump_file_data+44); PrintAndLog("\nBlock# | Data |lck| Ascii"); PrintAndLog("---------------------------------"); for (i = 0; i < Pages; ++i) { if ( i < 3 ) { - PrintAndLog("%02d/0x%02X | %s| | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4)); + PrintAndLog("%02d/0x%02X | %s| | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), data + i * 4 ); continue; } switch(i){ @@ -1486,10 +1678,10 @@ int CmdHF14AMfUDump(const char *Cmd){ PrintAndLog("Could not create file name %s", filename); return 1; } - fwrite( data, 1, Pages*4, fout ); + fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout ); fclose(fout); - PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages, Pages*4, filename); + PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+(DUMP_PREFIX_LENGTH/4), Pages*4 + DUMP_PREFIX_LENGTH, filename); return 0; } @@ -1497,7 +1689,6 @@ int CmdHF14AMfUDump(const char *Cmd){ // Ultralight C Methods //------------------------------------------------------------------------------- - // // Ultralight C Authentication Demo {currently uses hard-coded key} // @@ -1511,7 +1702,7 @@ int CmdHF14AMfucAuth(const char *Cmd){ //Change key to user defined one if (cmdp == 'k' || cmdp == 'K'){ keyNo = param_get8(Cmd, 1); - if(keyNo > KEYS_3DES_COUNT) + if(keyNo >= KEYS_3DES_COUNT) errors = true; } @@ -1647,14 +1838,13 @@ int CmdHF14AMfucSetPwd(const char *Cmd){ UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) { - if ( (resp.arg[0] & 0xff) == 1) + if ( (resp.arg[0] & 0xff) == 1) { PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16)); - else{ + } else { PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff); return 1; } - } - else { + } else { PrintAndLog("command execution time out"); return 1; } @@ -1670,6 +1860,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){ UsbCommand resp; uint8_t uid[7] = {0x00}; char cmdp = param_getchar(Cmd, 0); + if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid(); if (param_gethex(Cmd, 0, uid, 14)) { @@ -1737,7 +1928,6 @@ int CmdHF14AMfucSetUid(const char *Cmd){ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){ uint8_t uid[4]; - char cmdp = param_getchar(Cmd, 0); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse(); @@ -1823,110 +2013,32 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){ return 0; } -// static uint8_t * diversify_key(uint8_t * key){ - - - // return key; -// } - -// static void GenerateUIDe( uint8_t *uid, uint8_t len){ - // for (int i=0; i FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4; +int CmdHF14AMfUSim(const char *Cmd) { + char ctmp = param_getchar(Cmd, 0); + if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) return usage_hf_mfu_sim(); + return CmdHF14ASim(Cmd); +} - fnameptr += len; +int CmdHF14AMfuPwdGen(const char *Cmd){ + uint8_t uid[7] = {0x00}; + char cmdp = param_getchar(Cmd, 0); + if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_pwdgen(); - sprintf(fnameptr, ".eml"); - - // open file - f = fopen(filename, "r"); - if (f == NULL) { - PrintAndLog("File %s not found or locked", filename); - return 1; - } + if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen(); - 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; - PrintAndLog("File content error. Block data must include 32 HEX symbols"); - 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); - return 3; - } - 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; - } - PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename); - */ + PrintAndLog(" algo | pwd | pack"); + PrintAndLog("------+----------+-----"); + PrintAndLog(" EV1 | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid)); + PrintAndLog(" Ami | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid)); + PrintAndLog(" LD | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid)); return 0; } - - //------------------------------------ // Menu Stuff //------------------------------------ @@ -1936,18 +2048,21 @@ static command_t CommandTable[] = {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"}, {"info", CmdHF14AMfUInfo, 0, "Tag information"}, {"dump", CmdHF14AMfUDump, 0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"}, + {"eload", CmdHF14AMfUeLoad, 0, "load Ultralight .eml dump file into emulator memory"}, {"rdbl", CmdHF14AMfURdBl, 0, "Read block"}, {"wrbl", CmdHF14AMfUWrBl, 0, "Write block"}, - {"eload", CmdHF14AMfuELoad, 0, " Load from file emulator dump"}, {"cauth", CmdHF14AMfucAuth, 0, "Authentication - Ultralight C"}, - {"setpwd", CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"}, - {"setuid", CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"}, + {"setpwd", CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"}, + {"setuid", CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"}, + {"sim", CmdHF14AMfUSim, 0, "Simulate Ultralight from emulator memory"}, {"gen", CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"}, + {"pwdgen", CmdHF14AMfuPwdGen, 1, "Generate pwd from known algos"}, {NULL, NULL, 0, NULL} }; int CmdHFMFUltra(const char *Cmd){ - WaitForResponseTimeout(CMD_ACK,NULL,100); + clearCommandBuffer(); + //WaitForResponseTimeout(CMD_ACK,NULL,100); CmdsParse(CommandTable, Cmd); return 0; }