#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
#define MAX_NTAG_216 0xe6
-typedef enum TAGTYPE_UL {
- UNKNOWN = 0x0000,
- UL = 0x0001,
- UL_C = 0x0002,
- UL_EV1_48 = 0x0004,
- UL_EV1_128 = 0x0008,
- NTAG = 0x0010,
- NTAG_213 = 0x0020,
- NTAG_215 = 0x0040,
- NTAG_216 = 0x0080,
- MY_D = 0x0100,
- MY_D_NFC = 0x0200,
- MY_D_MOVE = 0x0400,
- MY_D_MOVE_NFC = 0x0800,
- MAGIC = 0x1000,
- UL_MAGIC = UL | MAGIC,
- UL_C_MAGIC = UL_C | MAGIC,
- UL_ERROR = 0xFFFF,
-} TagTypeUL_t;
-
#define KEYS_3DES_COUNT 7
uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
{ 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
{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){
SendCommand(&c);
}
-static void ul_switch_off_field(void) {
+void ul_switch_off_field(void) {
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
SendCommand(&c);
}
return -1;
}
-static int ulc_requestAuthentication( uint8_t blockNo, uint8_t *nonce, uint16_t nonceLength ){
+static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
- uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};
+ 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 ulev1_readTearing( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+
+ 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;
+}
+
static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
PrintAndLog(" BCC1 : %02X - crc should be %02X", data[8], crc1 );
PrintAndLog(" Internal : %02X - %s default", data[9], (data[9]==0x48)?"":"not" );
- PrintAndLog(" Lock : %s - %s", sprint_hex(data+10, 2),printBits( 2, data+10) );
- PrintAndLog("OneTimePad : %s ", sprint_hex(data + 12, 4));
- PrintAndLog("");
+ 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;
}
return 0;
}
-static int ul_print_type(uint16_t tagtype){
+int ul_print_type(uint16_t tagtype, uint8_t spaces){
+ char spc[11] = " ";
+ spc[10]=0x00;
+ char *spacer = spc + (10-spaces);
+
if ( tagtype & UL )
- PrintAndLog(" TYPE : MIFARE Ultralight (MF0ICU1) %s [%x]", (tagtype & MAGIC)?"<magic>":"", tagtype);
+ PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype);
else if ( tagtype & UL_C)
- PrintAndLog(" TYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", (tagtype & MAGIC)?"<magic>":"", tagtype );
+ PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype );
else if ( tagtype & UL_EV1_48)
- PrintAndLog(" TYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)");
+ PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
else if ( tagtype & UL_EV1_128)
- PrintAndLog(" TYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)");
+ PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
else if ( tagtype & NTAG_213 )
- PrintAndLog(" TYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)");
+ PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
else if ( tagtype & NTAG_215 )
- PrintAndLog(" TYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)");
+ PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
else if ( tagtype & NTAG_216 )
- PrintAndLog(" TYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)");
+ PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
else if ( tagtype & MY_D )
- PrintAndLog(" TYPE : INFINEON my-d\x99");
+ PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
else if ( tagtype & MY_D_NFC )
- PrintAndLog(" TYPE : INFINEON my-d\x99 NFC");
+ PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
else if ( tagtype & MY_D_MOVE )
- PrintAndLog(" TYPE : INFINEON my-d\x99 move");
+ PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
else if ( tagtype & MY_D_MOVE_NFC )
- PrintAndLog(" TYPE : INFINEON my-d\x99 move NFC");
+ PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
else
- PrintAndLog(" TYPE : Unknown %04x",tagtype);
+ PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);
return 0;
}
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(" 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
+ PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
return 0;
}
bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
if ( validAuth )
- PrintAndLog(" Auth0 [42/0x2A]: %s Pages above %d needs authentication", sprint_hex(data+8, 4), data[8] );
+ PrintAndLog(" Auth0 [42/0x2A]: %s Page %d and above need authentication", sprint_hex(data+8, 4), data[8] );
else{
if ( data[8] == 0){
PrintAndLog(" Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );
PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));
if ( data[3] < 0xff )
- PrintAndLog(" - pages above %d needs authentication",data[3]);
+ PrintAndLog(" - page %d and above need authentication",data[3]);
else
PrintAndLog(" - pages don't need authentication");
PrintAndLog(" - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
static int ulev1_print_counters(){
PrintAndLog("--- UL-EV1 Counters");
+ uint8_t tear[1] = {0};
uint8_t counter[3] = {0,0,0};
for ( uint8_t i = 0; i<3; ++i) {
+ ulev1_readTearing(i,tear,sizeof(tear));
ulev1_readCounter(i,counter, sizeof(counter) );
PrintAndLog(" [%0d] : %s", i, sprint_hex(counter,3));
+ PrintAndLog(" - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
}
return 0;
}
ul_switch_off_field();
return UL_ERROR;
}
- status = ulc_requestAuthentication(0, nonce1, sizeof(nonce1));
+ status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
if ( status > 0 ) {
- status = ulc_requestAuthentication(0, nonce2, sizeof(nonce2));
+ status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
returnValue = ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
} else {
returnValue = UL;
iso14a_card_select_t card;
int status = ul_select(&card);
if ( status < 1 ){
- PrintAndLog("Error: couldn't select ul_magic_test");
+ PrintAndLog("iso14443a card select failed");
ul_switch_off_field();
return UL_ERROR;
}
status = ul_comp_write(0, NULL, 0);
ul_switch_off_field();
- if ( status == 0)
+ if ( status == 0 )
return UL_MAGIC;
return UL;
}
case -1 : tagtype = (UL | UL_C); break; //when does this happen?
default : tagtype = UNKNOWN; break;
}
+ // UL-C test
if (tagtype == (UL | UL_C)) {
status = ul_select(&card);
if ( status < 1 ){
- PrintAndLog("Error: couldn't select 2");
+ PrintAndLog("iso14443a card select failed (UL-C)");
ul_switch_off_field();
return UL_ERROR;
}
uint8_t nonce1[11] = {0x00};
- status = ulc_requestAuthentication(0, nonce1, sizeof(nonce1));
- if ( status > 0 )
- tagtype = UL_C;
- else
- tagtype = UL;
+ status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
+ tagtype = ( status > 0 ) ? UL_C : UL;
if (status != -1) ul_switch_off_field();
}
iso14a_card_select_t card;
uint8_t *key;
int status;
+ bool errors = false;
+ bool hasAuthKey = false;
+ uint8_t cmdp = 0;
+ 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)
+ {
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ case 'H':
+ return usage_hf_mfu_info();
+ case 'k':
+ case 'K':
+ // EV1/NTAG size key
+ datalen = param_gethex(Cmd, cmdp+1, data, 8);
+ if ( !datalen ) {
+ memcpy(authenticationkey, data, 4);
+ cmdp += 2;
+ hasAuthKey = true;
+ break;
+ }
+ // UL-C size key
+ datalen = param_gethex(Cmd, cmdp+1, data, 32);
+ if (!datalen){
+ memcpy(authenticationkey, data, 16);
+ cmdp += 2;
+ hasAuthKey = true;
+ break;
+ }
+ errors = true;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = true;
+ break;
+ }
+ if(errors) break;
+ }
+ //Validations
+ if(errors) return usage_hf_mfu_info();
+
TagTypeUL_t tagtype = GetHF14AMfU_Type();
if (tagtype == UL_ERROR) return -1;
PrintAndLog("\n--- Tag Information ---------");
PrintAndLog("-------------------------------------------------------------");
- ul_print_type(tagtype);
+ ul_print_type(tagtype, 6);
status = ul_select(&card);
if ( status < 1 ){
- PrintAndLog("Error: couldn't select");
+ PrintAndLog("iso14443a card select failed");
ul_switch_off_field();
return status;
}
+ if ( hasAuthKey ) {
+ if ((tagtype & UL_C)) {
+ ul_switch_off_field();
+ //will select card automatically
+ if (try3DesAuthentication(authenticationkey, false) != 1) {
+ ul_switch_off_field();
+ PrintAndLog("Error: Authentication Failed UL-C");
+ return 0;
+ }
+ } else {
+ len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
+ if (len < 1) {
+ if (!len) 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 ){
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");
return status;
}
ulc_print_configuration(ulc_conf);
ulc_print_3deskey(ulc_deskey);
} else {
+ // if we called info with key, just return
+ if ( hasAuthKey ) return 1;
+
PrintAndLog("Trying some default 3des keys");
- ul_switch_off_field();
- for (uint8_t i = 0; i < 7; ++i ){
+ ul_switch_off_field(); //will select again in try3DesAuth...
+ for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
key = default_3des_keys[i];
- if (try3DesAuthentication(key) == 1){
+ if (try3DesAuthentication(key, true) == 1){
PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
- ulc_print_3deskey(SwapEndian64(key,16));
- return 0;
- }
+ 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)
}
}
}
// save AUTHENTICATION LIMITS for later:
authlim = (ulev1_conf[4] & 0x07);
+ bool allZeros = true;
+ for (uint8_t idx=0; idx<8; idx++)
+ if (ulev1_conf[idx]) allZeros = false;
+
+ if (allZeros) authlim=7;
ulev1_print_configuration(ulev1_conf);
}
}
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 ){
PrintAndLog("\n--- Known EV1/NTAG passwords.");
- uint8_t pack[4] = {0,0,0,0};
- 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();
ul_switch_off_field();
PrintAndLog("");
- return 0;
+ return 1;
}
//
return 0;
}
+int usage_hf_mfu_info(void)
+{
+ PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
+ PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
+ PrintAndLog("The following tags can be identified:\n");
+ PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1");
+ PrintAndLog("NTAG 213, NTAG 215, NTAG 216");
+ PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");
+ PrintAndLog("Usage: hf mfu info k <key>");
+ PrintAndLog(" Options : ");
+ PrintAndLog(" k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+ PrintAndLog("");
+ PrintAndLog(" sample : hf mfu info");
+ PrintAndLog(" : hf mfu info k 11223344");
+ return 0;
+}
+
int usage_hf_mfu_dump(void)
{
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 k <key> n <filename w/o .bin>");
+ PrintAndLog("Usage: hf mfu dump s k <key> n <filename w/o .bin>");
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");
+ PrintAndLog(" : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
return 0;
}
+
//
// Mifare Ultralight / Ultralight-C / Ultralight-EV1
// Read and Dump Card Contents, using auto detection of tag size.
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;
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
+ errors = true;
+
+ if (!errors)
+ memcpy(key, data, dataLen/2);
+
cmdp += 2;
hasPwd = true;
break;
+ case 'l':
+ case 'L':
+ swapEndian = true;
+ cmdp++;
+ break;
case 'n':
case 'N':
fileNlen = param_getstr(Cmd, cmdp+1, filename);
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.");
- }
+ 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;
}
// 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){
+ if (hasPwd && dataLen == 32){ //UL_C
memcpy(data + Pages*4, key, 16);
Pages += 4;
- }
+ }
+ //TODO add key MEM location for other tags
+
for (i = 0; i < Pages; ++i) {
if ( i < 3 ) {
PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
} else {
- sprintf(fnameptr + fileNlen," .bin");
+ sprintf(fnameptr + fileNlen,".bin");
}
if ((fout = fopen(filename,"wb")) == NULL) {
}
uint8_t *key = default_3des_keys[keyNo];
- if (try3DesAuthentication(key)>0)
+ if (try3DesAuthentication(key, true) > 0)
PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
else
PrintAndLog("Authentication failed");
return 0;
}
-int try3DesAuthentication( uint8_t *key){
+int try3DesAuthentication( uint8_t *key, bool switch_off_field ){
- uint8_t blockNo = 0;
- uint32_t cuid = 0;
+ //uint32_t cuid = 0;
des3_context ctx = { 0 };
uint8_t rnd_ab[16] = { 0 };
uint8_t iv[8] = { 0 };
- UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
+ 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];
+ //cuid = resp.arg[1];
memcpy(enc_random_b,resp.d.asBytes+1,8);
des3_set2key_dec(&ctx, key);
//Auth2
c.cmd = CMD_MIFAREUC_AUTH2;
- c.arg[0] = cuid;
+ c.arg[0] = switch_off_field;
memcpy(c.d.asBytes, rnd_ab, 16);
SendCommand(&c);
hasPwd = TRUE;
}
}
- //uint8_t *key2 = SwapEndian64(key, 16);
+ //uint8_t *key2 = SwapEndian64(key, 16, 8);
//Read Block
UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
projects / proxmark3-svn / blobdiff