#include "mifare.h"
#include "util.h"
#include "../common/protocols.h"
+#include "data.h"
#define MAX_UL_BLOCKS 0x0f
-#define MAX_ULC_BLOCKS 0x2f
-#define MAX_ULEV1a_BLOCKS 0x0b
+#define MAX_ULC_BLOCKS 0x2b
+#define MAX_ULEV1a_BLOCKS 0x12
#define MAX_ULEV1b_BLOCKS 0x20
+#define MAX_NTAG_203 0x2c
+#define MAX_NTAG_210 0x13
+#define MAX_NTAG_212 0x28
#define MAX_NTAG_213 0x2c
#define MAX_NTAG_215 0x86
-#define MAX_NTAG_216 0xe6
+#define MAX_NTAG_216 0xe6
#define KEYS_3DES_COUNT 7
uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
{ 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
{ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
{ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
- { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF } // 11 22 33
+ { 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 16
+uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128,
+ NTAG, NTAG_203, NTAG_210, NTAG_212, 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_203, MAX_NTAG_210, MAX_NTAG_212, 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){
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;
}
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
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 0;
+ if ( resp.arg[0] == 1 ) return 1;
+
+ return 0;
+}
+
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;
}
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;
}
// 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;
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;
}
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;
}
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;
}
PrintAndLog(" BCC1 : %02X, crc should be %02X", data[8], crc1 );
PrintAndLog(" Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
- PrintAndLog(" Lock : %s - %s", sprint_hex(data+10, 2),printBits( 2, data+10) );
- // if Page3 has NDEF magic number, its not a OTP..
- if ( data[12] != 0xE1 )
- PrintAndLog("OneTimePad : %s\n", sprint_hex(data + 12, 4));
+ PrintAndLog(" Lock : %s - %s",
+ sprint_hex(data+10, 2),
+ printBits(2, data+10)
+ );
+
+ PrintAndLog("OneTimePad : %s - %s\n",
+ sprint_hex(data + 12, 4),
+ printBits(4, data+12)
+ );
return 0;
}
-static int ntag_print_CC(uint8_t *data) {
+static int ndef_print_CC(uint8_t *data) {
- PrintAndLog("\n--- NTAG NDEF Message");
+ PrintAndLog("\n--- NDEF Message");
if(data[0] != 0xe1) {
- PrintAndLog("no NDEF message found");
+ PrintAndLog("no NDEF message");
return -1; // no NDEF message
}
PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
else if ( tagtype & UL_EV1_128)
PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+ else if ( tagtype & NTAG_203 )
+ PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301G0DU)", spacer);
+ else if ( tagtype & NTAG_210 )
+ PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+ else if ( tagtype & NTAG_212 )
+ PrintAndLog("%sTYPE : NTAG 212 1284bytes (NT2L1011G0DU)", spacer);
else if ( tagtype & NTAG_213 )
- PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+ PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
else if ( tagtype & NTAG_215 )
- PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+ PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
else if ( tagtype & NTAG_216 )
- PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+ PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
else if ( tagtype & MY_D )
PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
else if ( tagtype & MY_D_NFC )
PrintAndLog(" deskey1 [45/0x2D]: %s [%.4s]", sprint_hex(data+4 ,4),data+4);
PrintAndLog(" deskey2 [46/0x2E]: %s [%.4s]", sprint_hex(data+8 ,4),data+8);
PrintAndLog(" deskey2 [47/0x2F]: %s [%.4s]", sprint_hex(data+12,4),data+12);
-
- PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
+ PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
return 0;
}
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: {
tagtype = UL_EV1_48;
else if ( version[2] == 0x03 && version[6] != 0x0B )
tagtype = UL_EV1_128;
+ else if ( version[2] == 0x04 && version[6] == 0x0B )
+ tagtype = NTAG_210;
+ else if ( version[2] == 0x04 && version[6] == 0x0E )
+ tagtype = NTAG_212;
else if ( version[2] == 0x04 && version[6] == 0x0F )
tagtype = NTAG_213;
else if ( version[2] == 0x04 && version[6] == 0x11 )
}
case 0x01: tagtype = UL_C; break;
case 0x00: tagtype = UL; break;
- case -1 : tagtype = (UL | UL_C); break; //when does this happen? -- if getversion fails, it assumes it is either UL/ULC
+ case -1 : tagtype = (UL | UL_C); break; //when does this happen?
default : tagtype = UNKNOWN; break;
}
// UL-C test
status = ulc_requestAuthentication(nonce, sizeof(nonce));
tagtype = ( status > 0 ) ? UL_C : UL;
- if (status != -1) ul_switch_off_field();
+ ul_switch_off_field();
}
+
+ //NTAG203 detection here.
+
} else {
// Infinition MY-D tests Exam high nibble
uint8_t nib = (card.uid[1] & 0xf0) >> 4;
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)
{
PrintAndLog("-------------------------------------------------------------");
ul_print_type(tagtype, 6);
- status = ul_select(&card);
- if ( status < 1 ){
- PrintAndLog("iso14443a card select failed");
- ul_switch_off_field();
- return status;
- }
-
- if ( hasAuthKey ) {
- if ((tagtype & UL_C))
- try3DesAuthentication(authenticationkey);
- else
- ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
+ if ( hasAuthKey && (tagtype & UL_C)) {
+ //will select card automatically and close connection on error
+ if (!ulc_authentication(authenticationkey, false)) {
+ PrintAndLog("Error: Authentication Failed UL-C");
+ return 0;
+ }
+ } else {
+ status = ul_select(&card);
+ if ( status < 1 ){
+ PrintAndLog("iso14443a card select failed");
+ ul_switch_off_field();
+ return status;
+ }
+ if (hasAuthKey) {
+ 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,3 (should read 4pages)
+
+
+ // read pages 0,1,2,4 (should read 4pages)
status = ul_read(0, data, sizeof(data));
if ( status == -1 ){
- PrintAndLog("Error: tag didn't answer to READ A");
ul_switch_off_field();
+ PrintAndLog("Error: tag didn't answer to READ");
return status;
}
uint8_t ulc_conf[16] = {0x00};
status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
if ( status == -1 ){
- PrintAndLog("Error: tag didn't answer to READ - possibly locked");
+ PrintAndLog("Error: tag didn't answer to READ UL-C");
ul_switch_off_field();
return status;
}
-
ulc_print_configuration(ulc_conf);
if ((tagtype & MAGIC)){
uint8_t ulc_deskey[16] = {0x00};
status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
if ( status == -1 ){
- PrintAndLog("Error: tag didn't answer to READ magic");
ul_switch_off_field();
+ PrintAndLog("Error: tag didn't answer to READ magic");
return status;
}
ulc_print_3deskey(ulc_deskey);
} else {
-
+ ul_switch_off_field();
// if we called info with key, just return
if ( hasAuthKey ) return 1;
+ // also try to diversify default keys.. look into CmdHF14AMfuGenDiverseKeys
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)){
PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
- ulc_print_3deskey(SwapEndian64(key,16));
+ uint8_t keySwap[16];
+ memcpy(keySwap, SwapEndian64(key,16,8), 16);
+ ulc_print_3deskey(keySwap);
return 1;
}
}
+ return 1; //return even if key not found (UL_C is done)
}
}
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:
ulev1_print_configuration(ulev1_conf);
}
- if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
+ if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_210 | NTAG_212 | NTAG_213 | NTAG_215 | NTAG_216))) {
uint8_t version[10] = {0x00};
status = ulev1_getVersion(version, sizeof(version));
if ( status == -1 ){
- PrintAndLog("Error: tag didn't answer to GET_VERSION");
+ 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;
-
+
// AUTHLIMIT, (number of failed authentications)
// 0 = limitless.
- // 1-7 = ... should we even try then?
- if ( authlim == 0 ){
+ // 1-7 = limit. No automatic tries then.
+ // hasAuthKey, if we was called with key, skip test.
+ if ( authlim == 0 && !hasAuthKey ){
PrintAndLog("\n--- Known EV1/NTAG passwords.");
-
-
- int len=0; //if len goes to -1 the connection will be turned off.
+ len = 0;
for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ){
key = default_pwd_pack[i];
- if ( len > -1 ){
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]);
break;
+ } else {
+ status = ul_select(&card);
+ if ( status < 1 ){
+ PrintAndLog("iso14443a card select failed - ev1 auth");
+ ul_switch_off_field();
+ return status;
}
}
- if (len > -1) ul_switch_off_field();
+ }
}
}
- if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
-
- uint8_t cc[16] = {0x00};
- status = ul_read(3, cc, sizeof(cc));
- if ( status == -1 ){
- PrintAndLog("Error: tag didn't answer to READ ntag");
- ul_switch_off_field();
- return status;
- }
- ntag_print_CC(cc);
+ // NDEF Message
+ uint8_t cc[16] = {0x00};
+ status = ul_read(3, cc, sizeof(cc));
+ if ( status == -1 ){
+ PrintAndLog("Error: tag didn't answer to READ NDEF");
+ ul_switch_off_field();
+ return status;
}
+ ndef_print_CC(cc);
+
ul_switch_off_field();
PrintAndLog("");
PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
PrintAndLog("It autodetects card type.\n");
- PrintAndLog("Usage: hf mfu dump s k <key> n <filename w/o .bin>");
+ PrintAndLog("Usage: hf mfu dump l k <key> n <filename w/o .bin> p <> q <>");
PrintAndLog(" Options : ");
- PrintAndLog(" k <key> : Enter key for authentication");
- PrintAndLog(" n <FN > : Enter filename w/o .bin to save the dump as");
- PrintAndLog(" s : Swap entered key's endianness for auth");
+ PrintAndLog(" k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+ PrintAndLog(" l : swap entered key's endianness for auth");
+ PrintAndLog(" n <FN > : filename w/o .bin to save the dump as");
+ PrintAndLog(" p <Pg > : starting Page number to manually set a page to start the dump at");
+ PrintAndLog(" q <qty> : number of Pages to manually set how many pages to dump");
+
PrintAndLog("");
PrintAndLog(" sample : hf mfu dump");
PrintAndLog(" : hf mfu dump n myfile");
FILE *fout;
char filename[FILE_PATH_SIZE] = {0x00};
char * fnameptr = filename;
- char* str = "Dumping Ultralight%s%s Card Data...";
uint8_t *lockbytes_t = NULL;
uint8_t lockbytes[2] = {0x00};
uint8_t *lockbytes_t2 = NULL;
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)
{
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{
+ PrintAndLog("\nERROR: Key is incorrect length\n");
+ errors = true;
+ }
+
cmdp += 2;
- hasPwd = true;
+ hasPwd = true;
+ break;
+ case 'l':
+ case 'L':
+ swapEndian = true;
+ cmdp++;
break;
case 'n':
case 'N':
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));
//Validations
if(errors) return usage_hf_mfu_dump();
- if (swapEndian)
- keyPtr = SwapEndian64(data, 16);
+ 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.");
- }
-
- UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}};
- if ( hasPwd ) {
- c.arg[2] = 1;
- memcpy(c.d.asBytes, key, 16);
+ if (!manualPages)
+ for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
+ if (tagtype & UL_TYPES_ARRAY[idx])
+ Pages = UL_MEMORY_ARRAY[idx]+1;
+
+ ul_print_type(tagtype, 0);
+ PrintAndLog("Reading tag memory...");
+ UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
+ if ( hasPwd ) {
+ 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;
PrintAndLog("Command execute time-out");
return 1;
}
- PrintAndLog ("%u,%u",resp.arg[0],resp.arg[1]);
- uint8_t isOK = resp.arg[0] & 0xff;
- if (isOK) {
- memcpy(data, resp.d.asBytes, resp.arg[1]);
- } else {
+ if (resp.arg[0] != 1) {
PrintAndLog("Failed reading block: (%02x)", i);
return 1;
}
+ uint32_t bufferSize = resp.arg[1];
+ if (bufferSize > sizeof(data)) {
+ PrintAndLog("Data exceeded Buffer size!");
+ bufferSize = sizeof(data);
+ }
+ GetFromBigBuf(data, bufferSize, 0);
+ WaitForResponse(CMD_ACK,NULL);
+
+ Pages = bufferSize/4;
// Load lock bytes.
int j = 0;
}
// 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];
}
}
- // add keys
- if (hasPwd){
- memcpy(data + Pages*4, key, 16);
+ // add keys to block dump
+ if (hasPwd && (tagtype & UL_C)){ //UL_C
+ memcpy(data + Pages*4, key, dataLen/2);
Pages += 4;
+ } else if (hasPwd) { //not sure output is in correct location.
+ memcpy(data + Pages*4, key, dataLen/2);
+ Pages += 1;
}
+
for (i = 0; i < Pages; ++i) {
if ( i < 3 ) {
PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
return 0;
}
-// Needed to Authenticate to Ultralight C tags
-void rol (uint8_t *data, const size_t len){
- uint8_t first = data[0];
- for (size_t i = 0; i < len-1; i++) {
- data[i] = data[i+1];
- }
- data[len-1] = first;
-}
-
//-------------------------------------------------------------------------------
// Ultralight C Methods
//-------------------------------------------------------------------------------
}
uint8_t *key = default_3des_keys[keyNo];
- if (try3DesAuthentication(key)>0)
+ if (ulc_authentication(key, true))
PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
else
PrintAndLog("Authentication failed");
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);
-
- //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(rnd_ab, 16));
-
- 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);
-
- //PrintAndLog(" enc(A+B) :%s", sprint_hex(rnd_ab, 16));
- //PrintAndLog(" enc(RndA') :%s", sprint_hex(enc_resp, 8));
-
- if ( !memcmp(resp_random_a, random_a, 8))
- return 1;
- return 0;
-}
-
/**
A test function to validate that the polarssl-function works the same
was as the openssl-implementation.
// return;
// }
+//------------------------------------
+// Menu Stuff
+//------------------------------------
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
projects / proxmark3-svn / blobdiff