X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6fdf42c61cd4c1a71c2b1de2887e28ed33b4cd70..8258f409697ab41a6858ef9bdcdf406989223bbb:/client/cmdhfmfu.c diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index d8060894..a22ff859 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -17,7 +17,7 @@ #define MAX_UL_BLOCKS 0x0f #define MAX_ULC_BLOCKS 0x2f -#define MAX_ULEV1a_BLOCKS 0x0b +#define MAX_ULEV1a_BLOCKS 0x12 #define MAX_ULEV1b_BLOCKS 0x20 #define MAX_NTAG_213 0x2c #define MAX_NTAG_215 0x86 @@ -34,34 +34,46 @@ 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 8 +#define KEYS_PWD_COUNT 10 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 13 +uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, + NTAG, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC}; +uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, + MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_213, MAX_NTAG_213, MAX_NTAG_215, + MAX_NTAG_216, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS}; + + static int CmdHelp(const char *Cmd); -char* getProductTypeStr( uint8_t id){ +char *getProductTypeStr( uint8_t id){ static char buf[20]; char *retStr = buf; switch(id) { case 3: - sprintf(retStr, "0x%02X %s", id, "(Ultralight)"); + sprintf(retStr, "%02X %s", id, "(Ultralight)"); break; case 4: - sprintf(retStr, "0x%02X %s", id, "(NTAG)"); + sprintf(retStr, "%02X %s", id, "(NTAG)"); break; default: - sprintf(retStr, "0x%02X %s", id, "(unknown)"); + sprintf(retStr, "%02X %s", id, "(unknown)"); break; } return buf; @@ -72,7 +84,7 @@ char* getProductTypeStr( uint8_t id){ the LSBit is set to '0' if the size is exactly 2^n and set to '1' if the storage size is between 2^n and 2^(n+1). */ -char* getUlev1CardSizeStr( uint8_t fsize ){ +char *getUlev1CardSizeStr( uint8_t fsize ){ static char buf[40]; char *retStr = buf; @@ -145,8 +157,6 @@ static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){ uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength); - if ( len == -1 ) - ul_switch_off_field(); return len; } @@ -161,9 +171,7 @@ static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){ memcpy(cmd+2, data, datalen); uint8_t response[1] = {0xff}; - int len = ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response)); - if ( len == -1 ) - ul_switch_off_field(); + ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response)); // ACK if ( response[0] == 0x0a ) return 0; // NACK @@ -174,17 +182,25 @@ static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){ uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength); - if ( len == -1 ) - ul_switch_off_field(); return len; } +static int ulc_authentication( uint8_t *key, bool switch_off_field ){ + + UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}}; + memcpy(c.d.asBytes, key, 16); + SendCommand(&c); + UsbCommand resp; + if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return -1; + if ( resp.arg[0] == 1 ) return 0; + + return -2; +} + static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){ uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength); - if ( len == -1) - ul_switch_off_field(); return len; } @@ -192,8 +208,6 @@ static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){ uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength); - if ( len == -1 ) - ul_switch_off_field(); return len; } @@ -202,7 +216,6 @@ static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){ // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock}; // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){ - // ul_switch_off_field(); // return -1; // } // return 0; @@ -212,8 +225,6 @@ static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t respo uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength); - if (len == -1) - ul_switch_off_field(); return len; } @@ -221,8 +232,6 @@ static int ulev1_readTearing( uint8_t counter, uint8_t *response, uint16_t respo uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength); - if (len == -1) - ul_switch_off_field(); return len; } @@ -230,15 +239,12 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){ uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00}; int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength); - if (len == -1) - ul_switch_off_field(); return len; } static int ul_print_default( uint8_t *data){ uint8_t uid[7]; - uid[0] = data[0]; uid[1] = data[1]; uid[2] = data[2]; @@ -496,7 +502,7 @@ uint16_t GetHF14AMfU_Type(void){ status = ul_select(&card); if ( status < 1 ){ - PrintAndLog("Error: couldn't select"); + PrintAndLog("iso14443a card select failed"); ul_switch_off_field(); return UL_ERROR; } @@ -510,7 +516,7 @@ uint16_t GetHF14AMfU_Type(void){ if ( card.uid[0] != 0x05) { len = ulev1_getVersion(version, sizeof(version)); - if (len > -1) ul_switch_off_field(); //if -1 it is already off + ul_switch_off_field(); switch (len) { case 0x0A: { @@ -543,11 +549,11 @@ uint16_t GetHF14AMfU_Type(void){ ul_switch_off_field(); return UL_ERROR; } - uint8_t nonce1[11] = {0x00}; - status = ulc_requestAuthentication(nonce1, sizeof(nonce1)); + uint8_t nonce[11] = {0x00}; + status = ulc_requestAuthentication(nonce, sizeof(nonce)); tagtype = ( status > 0 ) ? UL_C : UL; - if (status != -1) ul_switch_off_field(); + ul_switch_off_field(); } } else { // Infinition MY-D tests Exam high nibble @@ -578,6 +584,7 @@ int CmdHF14AMfUInfo(const char *Cmd){ uint8_t datalen = 0; uint8_t authenticationkey[16] = {0x00}; uint8_t pack[4] = {0,0,0,0}; + int len=0; while(param_getchar(Cmd, cmdp) != 0x00) { @@ -632,15 +639,28 @@ int CmdHF14AMfUInfo(const char *Cmd){ } if ( hasAuthKey ) { - if ((tagtype & UL_C)) - try3DesAuthentication(authenticationkey); - else - ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack)); + if ((tagtype & UL_C)) { + //will select card automatically + if (ulc_authentication(authenticationkey, false) != 0) { + ul_switch_off_field(); + PrintAndLog("Error: Authentication Failed UL-C"); + return 0; + } + } else { + len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack)); + if (len < 1) { + ul_switch_off_field(); + PrintAndLog("Error: Authentication Failed UL-EV1/NTAG"); + return 0; + } + } } + // read pages 0,1,2,4 (should read 4pages) status = ul_read(0, data, sizeof(data)); if ( status == -1 ){ + ul_switch_off_field(); PrintAndLog("Error: tag didn't answer to READ"); return status; } @@ -663,6 +683,7 @@ int CmdHF14AMfUInfo(const char *Cmd){ uint8_t ulc_deskey[16] = {0x00}; status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey)); if ( status == -1 ){ + ul_switch_off_field(); PrintAndLog("Error: tag didn't answer to READ magic"); return status; } @@ -673,17 +694,19 @@ int CmdHF14AMfUInfo(const char *Cmd){ if ( hasAuthKey ) return 1; PrintAndLog("Trying some default 3des keys"); - ul_switch_off_field(); for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){ key = default_3des_keys[i]; - if (try3DesAuthentication(key) == 1){ + if (ulc_authentication(key, true) == 0){ PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16)); uint8_t keySwap[16]; memcpy(keySwap, SwapEndian64(key,16,8), 16); ulc_print_3deskey(keySwap); + ul_switch_off_field(); return 1; - } + } } + ul_switch_off_field(); + return 1; //return even if key not found (UL_C is done) } } @@ -695,6 +718,7 @@ int CmdHF14AMfUInfo(const char *Cmd){ status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature)); if ( status == -1 ){ PrintAndLog("Error: tag didn't answer to READ SIGNATURE"); + ul_switch_off_field(); return status; } ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature)); @@ -704,6 +728,7 @@ int CmdHF14AMfUInfo(const char *Cmd){ status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf)); if ( status == -1 ){ PrintAndLog("Error: tag didn't answer to READ EV1"); + ul_switch_off_field(); return status; } // save AUTHENTICATION LIMITS for later: @@ -722,12 +747,16 @@ int CmdHF14AMfUInfo(const char *Cmd){ status = ulev1_getVersion(version, sizeof(version)); if ( status == -1 ){ PrintAndLog("Error: tag didn't answer to GETVERSION"); + ul_switch_off_field(); return status; } ulev1_print_version(version); // if we called info with key, just return - if ( hasAuthKey ) return 1; + if ( hasAuthKey ) { + ul_switch_off_field(); + return 1; + } // AUTHLIMIT, (number of failed authentications) // 0 = limitless. @@ -735,16 +764,16 @@ int CmdHF14AMfUInfo(const char *Cmd){ if ( authlim == 0 ){ PrintAndLog("\n--- Known EV1/NTAG passwords."); - int len=0; //if len goes to -1 the connection will be turned off. for (uint8_t i = 0; i < 3; ++i ){ key = default_pwd_pack[i]; if ( len > -1 ){ len = ulev1_requestAuthentication(key, pack, sizeof(pack)); - PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]); - break; + if (len == 1) { + PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]); + break; + } } } - if (len > -1) ul_switch_off_field(); } } @@ -899,9 +928,12 @@ int usage_hf_mfu_dump(void) PrintAndLog("It autodetects card type.\n"); PrintAndLog("Usage: hf mfu dump s k n "); PrintAndLog(" Options : "); - PrintAndLog(" k : Enter key for authentication"); - PrintAndLog(" n : Enter filename w/o .bin to save the dump as"); - PrintAndLog(" s : Swap entered key's endianness for auth"); + PrintAndLog(" k : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]"); + PrintAndLog(" l : swap entered key's endianness for auth"); + 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"); @@ -919,7 +951,7 @@ int CmdHF14AMfUDump(const char *Cmd){ FILE *fout; char filename[FILE_PATH_SIZE] = {0x00}; char *fnameptr = filename; - char *str = "Dumping Ultralight%s%s Card Data..."; + //char *str = "Dumping Ultralight%s%s Card Data..."; uint8_t *lockbytes_t = NULL; uint8_t lockbytes[2] = {0x00}; uint8_t *lockbytes_t2 = NULL; @@ -938,6 +970,9 @@ int CmdHF14AMfUDump(const char *Cmd){ size_t fileNlen = 0; bool errors = false; bool swapEndian = false; + bool manualPages = false; + uint8_t startPage = 0; + char tempStr[50]; while(param_getchar(Cmd, cmdp) != 0x00) { @@ -948,15 +983,22 @@ int CmdHF14AMfUDump(const char *Cmd){ return usage_hf_mfu_dump(); case 'k': case 'K': - dataLen = param_gethex(Cmd, cmdp+1, data, 32); - if (dataLen) { - errors = true; - } else { - memcpy(key, data, 16); - } + dataLen = param_getstr(Cmd, cmdp+1, tempStr); + if (dataLen == 32) //ul-c + errors = param_gethex(tempStr, 0, key, dataLen); + else if (dataLen == 8) //ev1/ntag + errors = param_gethex(tempStr, 0, key, dataLen); + else + errors = true; + cmdp += 2; hasPwd = true; break; + case 'l': + case 'L': + swapEndian = true; + cmdp++; + break; case 'n': case 'N': fileNlen = param_getstr(Cmd, cmdp+1, filename); @@ -964,9 +1006,17 @@ int CmdHF14AMfUDump(const char *Cmd){ if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5; cmdp += 2; break; - case 's': - swapEndian = true; - cmdp++; + case 'p': + case 'P': + startPage = param_get8(Cmd, cmdp+1); + manualPages = true; + cmdp += 2; + break; + case 'q': + case 'Q': + Pages = param_get8(Cmd, cmdp+1); + cmdp += 2; + manualPages = true; break; default: PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); @@ -979,36 +1029,28 @@ int CmdHF14AMfUDump(const char *Cmd){ //Validations if(errors) return usage_hf_mfu_dump(); - if (swapEndian) + if (swapEndian && dataLen == 32) keyPtr = SwapEndian64(data, 16, 8); TagTypeUL_t tagtype = GetHF14AMfU_Type(); if (tagtype == UL_ERROR) return -1; - if ( tagtype & UL ) { - Pages = 16; - PrintAndLog(str,"", (tagtype & MAGIC)?" (magic)":"" ); - } - else if ( tagtype & UL_C ) { - Pages = 44; - PrintAndLog(str,"-C", (tagtype & MAGIC)?" (magic)":"" ); - } - else if ( tagtype & UL_EV1_48 ) { - Pages = 18; - PrintAndLog(str," EV1_48",""); - } - else if ( tagtype & UL_EV1_128 ) { - Pages = 32; - PrintAndLog(str," EV1_128",""); - } else { - Pages = 16; - PrintAndLog("Dumping unknown Ultralight, using default values."); - } + if (!manualPages) + for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++) + if (tagtype & UL_TYPES_ARRAY[idx]) + Pages = UL_MEMORY_ARRAY[idx]+1; - UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}}; + ul_print_type(tagtype, 0); + PrintAndLog("Reading tag memory..."); + + UsbCommand c = {CMD_MIFAREUC_READCARD, {startPage,Pages}}; if ( hasPwd ) { - c.arg[2] = 1; - memcpy(c.d.asBytes, key, 16); + if (tagtype & UL_C) + c.arg[2] = 1; //UL_C auth + else + c.arg[2] = 2; //UL_EV1/NTAG auth + + memcpy(c.d.asBytes, key, dataLen/2); } SendCommand(&c); UsbCommand resp; @@ -1036,6 +1078,7 @@ int CmdHF14AMfUDump(const char *Cmd){ } // Load bottom lockbytes if available + // HOW DOES THIS APPLY TO EV1 and/or NTAG??? if ( Pages == 44 ) { lockbytes_t2 = data + (40*4); lockbytes2[0] = lockbytes_t2[2]; @@ -1046,10 +1089,11 @@ int CmdHF14AMfUDump(const char *Cmd){ } // add keys - if (hasPwd){ - memcpy(data + Pages*4, key, 16); + if (hasPwd){ //UL_C + memcpy(data + Pages*4, key, dataLen/2); Pages += 4; - } + } + for (i = 0; i < Pages; ++i) { if ( i < 3 ) { PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4)); @@ -1122,6 +1166,7 @@ int CmdHF14AMfUDump(const char *Cmd){ return 0; } +/* // Needed to Authenticate to Ultralight C tags void rol (uint8_t *data, const size_t len){ uint8_t first = data[0]; @@ -1130,6 +1175,7 @@ void rol (uint8_t *data, const size_t len){ } data[len-1] = first; } +*/ //------------------------------------------------------------------------------- // Ultralight C Methods @@ -1148,7 +1194,7 @@ int CmdHF14AMfucAuth(const char *Cmd){ //Change key to user defined one if (cmdp == 'k' || cmdp == 'K'){ keyNo = param_get8(Cmd, 1); - if(keyNo > 6) + if(keyNo > KEYS_3DES_COUNT) errors = true; } @@ -1170,7 +1216,7 @@ int CmdHF14AMfucAuth(const char *Cmd){ } uint8_t *key = default_3des_keys[keyNo]; - if (try3DesAuthentication(key)>0) + if (ulc_authentication(key, true) == 0) PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16)); else PrintAndLog("Authentication failed"); @@ -1178,68 +1224,6 @@ int CmdHF14AMfucAuth(const char *Cmd){ return 0; } -int try3DesAuthentication( uint8_t *key){ - - uint32_t cuid = 0; - - des3_context ctx = { 0 }; - - uint8_t random_a[8] = { 1,1,1,1,1,1,1,1 }; - uint8_t random_b[8] = { 0 }; - uint8_t enc_random_b[8] = { 0 }; - uint8_t rnd_ab[16] = { 0 }; - uint8_t iv[8] = { 0 }; - - UsbCommand c = {CMD_MIFAREUC_AUTH1, {0x00}}; - SendCommand(&c); - UsbCommand resp; - if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return -1; - if ( !(resp.arg[0] & 0xff) ) return -2; - - cuid = resp.arg[1]; - memcpy(enc_random_b,resp.d.asBytes+1,8); - - des3_set2key_dec(&ctx, key); - // context, mode, length, IV, input, output - des3_crypt_cbc( &ctx, DES_DECRYPT, sizeof(random_b), iv , enc_random_b , random_b); - - rol(random_b,8); - memcpy(rnd_ab ,random_a,8); - memcpy(rnd_ab+8,random_b,8); - - des3_set2key_enc(&ctx, key); - // context, mode, length, IV, input, output - des3_crypt_cbc(&ctx, DES_ENCRYPT, sizeof(rnd_ab), enc_random_b, rnd_ab, rnd_ab); - - //Auth2 - c.cmd = CMD_MIFAREUC_AUTH2; - c.arg[0] = cuid; - memcpy(c.d.asBytes, rnd_ab, 16); - SendCommand(&c); - - if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1; - if ( !(resp.arg[0] & 0xff)) return -2; - - uint8_t enc_resp[8] = { 0 }; - uint8_t resp_random_a[8] = { 0 }; - memcpy(enc_resp, resp.d.asBytes+1, 8); - - des3_set2key_dec(&ctx, key); - // context, mode, length, IV, input, output - des3_crypt_cbc( &ctx, DES_DECRYPT, 8, enc_random_b, enc_resp, resp_random_a); - - if ( !memcmp(resp_random_a, random_a, 8)) - return 1; - return 0; - - //PrintAndLog(" RndA :%s", sprint_hex(random_a, 8)); - //PrintAndLog(" enc(RndB) :%s", sprint_hex(enc_random_b, 8)); - //PrintAndLog(" RndB :%s", sprint_hex(random_b, 8)); - //PrintAndLog(" A+B :%s", sprint_hex(random_a_and_b, 16)); - //PrintAndLog(" enc(A+B) :%s", sprint_hex(random_a_and_b, 16)); - //PrintAndLog(" enc(RndA') :%s", sprint_hex(data2+1, 8)); -} - /** A test function to validate that the polarssl-function works the same was as the openssl-implementation. @@ -1376,7 +1360,6 @@ int CmdHF14AMfUCRdBl(const char *Cmd) hasPwd = TRUE; } } - //uint8_t *key2 = SwapEndian64(key, 16, 8); //Read Block UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};