X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2b1f4228c2987459445d30443f92038f9ea080c6..089f91dc9da296f3dfcd95d01553e5ad7fcff99f:/client/cmdhfmfu.c diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 82289d5b..c7de6c7d 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -100,6 +100,25 @@ uint32_t ul_ev1_pwdgenB(uint8_t* uid) { 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); +} + void ul_ev1_pwdgen_selftest(){ uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10}; @@ -109,6 +128,10 @@ void ul_ev1_pwdgen_selftest(){ 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; } @@ -915,6 +938,14 @@ int CmdHF14AMfUInfo(const char *Cmd){ 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]; @@ -1252,24 +1283,26 @@ int usage_hf_mfu_eload(void) { PrintAndLog("Usage: hf mfu eload u [numblocks]"); PrintAndLog(" Options:"); PrintAndLog(" h : this help"); - PrintAndLog(" u : UL"); - PrintAndLog(" numblocks : number of blocks to load from eml file"); + 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 u filename"); PrintAndLog(" hf mfu eload u filename 57"); - return 0; + 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 = NTAG or Ultralight sim"); - PrintAndLog(" u : 4 or 7 byte UID"); + 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; } @@ -1401,6 +1434,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); @@ -1467,34 +1501,8 @@ int CmdHF14AMfUDump(const char *Cmd){ } } - // add keys to block dump - if (hasAuthKey) { - if (!swapEndian){ - authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4); - } else { - authKeyPtr = authenticationkey; - } - - if (tagtype & UL_C){ //add 4 pages - memcpy(data + Pages*4, authKeyPtr, dataLen); - Pages += dataLen/4; - } else { // 2nd page from end - memcpy(data + (Pages*4) - 8, authenticationkey, dataLen); - } - } - uint8_t get_pack[] = {0,0}; iso14a_card_select_t card; - //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)); - 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}; @@ -1503,6 +1511,17 @@ int CmdHF14AMfUDump(const char *Cmd){ 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 @@ -1520,6 +1539,28 @@ int CmdHF14AMfUDump(const char *Cmd){ 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 { + authKeyPtr = authenticationkey; + } + + if (tagtype & UL_C){ //add 4 pages + memcpy(data + Pages*4, authKeyPtr, dataLen); + Pages += dataLen/4; + } else { // 2nd page from end + memcpy(data + (Pages*4) - 8, authenticationkey, dataLen); + } + } + + //add *special* blocks to dump //get version memcpy(dump_file_data, get_version, sizeof(get_version)); //tearing @@ -1528,16 +1569,17 @@ int CmdHF14AMfUDump(const char *Cmd){ memcpy(dump_file_data+13, get_pack, sizeof(get_pack)); //signature memcpy(dump_file_data+16, get_signature, sizeof(get_signature)); - //block read data + //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("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); @@ -1547,7 +1589,6 @@ int CmdHF14AMfUDump(const char *Cmd){ 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) { @@ -1619,7 +1660,7 @@ int CmdHF14AMfUDump(const char *Cmd){ fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout ); fclose(fout); - PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+12, (Pages+12)*4, filename); + PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+(DUMP_PREFIX_LENGTH/4), Pages*4 + DUMP_PREFIX_LENGTH, filename); return 0; } @@ -1776,14 +1817,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; } @@ -1799,6 +1839,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)) { @@ -1866,7 +1907,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(); @@ -1985,7 +2025,8 @@ static command_t CommandTable[] = }; int CmdHFMFUltra(const char *Cmd){ - WaitForResponseTimeout(CMD_ACK,NULL,100); + clearCommandBuffer(); + //WaitForResponseTimeout(CMD_ACK,NULL,100); CmdsParse(CommandTable, Cmd); return 0; }