cvs.zerfleddert.de Git - proxmark3-svn/blobdiff

#include "mifare.h"

#include "util.h"

#include "protocols.h"

#include "mifare.h"

#include "util.h"

#include "protocols.h"

+#include "data.h"

#define MAX_UL_BLOCKS 0x0f

-#define MAX_ULC_BLOCKS 0x2f

-#define MAX_ULEV1a_BLOCKS 0x0b

-#define MAX_ULEV1b_BLOCKS 0x20

+#define MAX_ULC_BLOCKS 0x2b

+#define MAX_ULEV1a_BLOCKS 0x13

+#define MAX_ULEV1b_BLOCKS 0x28

+#define MAX_NTAG_203 0x29

+#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_213 0x2c

#define MAX_NTAG_215 0x86

#define MAX_NTAG_216 0xe6

{ 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

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)

{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)

};

{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_203, 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){

+char *getProductTypeStr( uint8_t id){

static char buf[20];

char *retStr = buf;

switch(id) {

static char buf[20];

char *retStr = buf;

switch(id) {

- case 3:

- sprintf(retStr, "0x%02X %s", id, "(Ultralight)");

- break;

- case 4:

- sprintf(retStr, "0x%02X %s", id, "(NTAG)");

- break;

- default:

- sprintf(retStr, "0x%02X %s", id, "(unknown)");

- break;

+ case 3: sprintf(retStr, "%02X, Ultralight", id); break;

+ case 4: sprintf(retStr, "%02X, NTAG", id); break;

+ default: sprintf(retStr, "%02X, unknown", id); break;

}

return buf;

}

return buf;

}

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).

*/

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;

static char buf[40];

char *retStr = buf;

// is LSB set?

if ( fsize & 1 )

// is LSB set?

if ( fsize & 1 )

- sprintf(retStr, "%02X (%u <-> %u bytes)",fsize, usize, lsize);

+ sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);

else

- sprintf(retStr, "%02X (%u bytes)", fsize, lsize);

+ sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);

return buf;

}

return buf;

}

ul_switch_on_field();

UsbCommand resp;

ul_switch_on_field();

UsbCommand resp;

- if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;

- if (resp.arg[0] < 1) return -1;

+ bool ans = false;

+ ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);

+ if (!ans || resp.arg[0] < 1) {

+ PrintAndLog("iso14443a card select failed");

+ ul_switch_off_field();

+ return 0;

+ }

memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));

- return resp.arg[0];

+ return 1;

}

// This read command will at least return 16bytes.

}

// This read command will at least return 16bytes.

uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};

int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, 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;

}

return len;

}

memcpy(cmd+2, data, datalen);

uint8_t response[1] = {0xff};

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

// 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);

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;

}

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);

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;

}

return len;

}

+static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authenticationkey, uint8_t *pack, uint8_t packSize){

+ 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 {

+ if ( !ul_select(card) ) return 0;

+

+ if (hasAuthKey) {

+ if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 1) {

+ ul_switch_off_field();

+ PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");

+ return 0;

+ }

+ return 1;

+}

+

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);

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;

}

return len;

}

// uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock};

// if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){

// 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;

// return -1;

// }

// return 0;

uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};

int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);

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;

}

return len;

}

uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};

int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, 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;

}

return len;

}

uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};

int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, 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];

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];

uid[0] = data[0];

uid[1] = data[1];

uid[2] = data[2];

// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2

int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];

if ( data[3] == crc0 )

// CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2

int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];

if ( data[3] == crc0 )

- PrintAndLog(" BCC0 : %02X - Ok", data[3]);

+ PrintAndLog(" BCC0 : %02X, Ok", data[3]);

else

- PrintAndLog(" BCC0 : %02X - crc should be %02X", data[3], crc0);

+ PrintAndLog(" BCC0 : %02X, crc should be %02X", data[3], crc0);

int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];

if ( data[8] == crc1 )

int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];

if ( data[8] == crc1 )

- PrintAndLog(" BCC1 : %02X - Ok", data[8]);

+ PrintAndLog(" BCC1 : %02X, Ok", data[8]);

else

- PrintAndLog(" BCC1 : %02X - crc should be %02X", data[8], crc1 );

+ PrintAndLog(" BCC1 : %02X, crc should be %02X", data[8], crc1 );

+

+ PrintAndLog(" Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );

- 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(" 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)

);

PrintAndLog("OneTimePad : %s - %s\n",

sprint_hex(data + 12, 4),

printBits(4, data+12)

);

+

return 0;

}

return 0;

}

-static int ntag_print_CC(uint8_t *data) {

-

- PrintAndLog("\n--- NTAG NDEF Message");

-

- if(data[0] != 0xe1) {

- PrintAndLog("no NDEF message");

- return -1; // no NDEF message

- }

+static int ndef_print_CC(uint8_t *data) {

+ // no NDEF message

+ if(data[0] != 0xe1)

+ return -1;

+ PrintAndLog("--- NDEF Message");

PrintAndLog("Capability Container: %s", sprint_hex(data,4) );

- PrintAndLog(" %02X: NDEF Magic Number", data[0]);

- PrintAndLog(" %02X: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);

- PrintAndLog(" %02X: Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);

+ PrintAndLog(" %02X : NDEF Magic Number", data[0]);

+ PrintAndLog(" %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);

+ PrintAndLog(" %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);

if ( data[2] == 0x12 )

- PrintAndLog(" %02X: NDEF Memory Size: %d bytes", data[2], 144);

+ PrintAndLog(" %02X : NDEF Memory Size: %d bytes", data[2], 144);

else if ( data[2] == 0x3e )

- PrintAndLog(" %02X: NDEF Memory Size: %d bytes", data[2], 496);

+ PrintAndLog(" %02X : NDEF Memory Size: %d bytes", data[2], 496);

else if ( data[2] == 0x6d )

- PrintAndLog(" %02X: NDEF Memory Size: %d bytes", data[2], 872);

-

- PrintAndLog(" %02X: %s / %s", data[3],

+ PrintAndLog(" %02X : NDEF Memory Size: %d bytes", data[2], 872);

+

+ PrintAndLog(" %02X : %s / %s", data[3],

(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",

(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");

return 0;

}

(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security",

(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");

return 0;

}

-int ul_print_type(uint16_t tagtype, uint8_t spaces){

+int ul_print_type(uint32_t tagtype, uint8_t spaces){

char spc[11] = " ";

spc[10]=0x00;

char *spacer = spc + (10-spaces);

if ( tagtype & UL )

char spc[11] = " ";

spc[10]=0x00;

char *spacer = spc + (10-spaces);

if ( tagtype & UL )

- PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype);

+ PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

else if ( tagtype & UL_C)

- PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype );

+ PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

else if ( tagtype & UL_EV1_48)

PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);

else if ( tagtype & UL_EV1_48)

PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);

- else if ( tagtype & UL_EV1_128)

+ else if ( tagtype & UL_EV1_128)

PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);

+ else if ( tagtype & NTAG )

+ PrintAndLog("%sTYPE : NTAG UNKNOWN", spacer);

+ else if ( tagtype & NTAG_203 )

+ PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);

+ else if ( tagtype & NTAG_210 )

+ PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);

+ else if ( tagtype & NTAG_212 )

+ PrintAndLog("%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", 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 & NTAG_I2C_1K )

+ PrintAndLog("%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");

+ else if ( tagtype & NTAG_I2C_2K )

+ PrintAndLog("%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");

else if ( tagtype & MY_D )

PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);

else if ( tagtype & MY_D_NFC )

else if ( tagtype & MY_D )

PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);

else if ( tagtype & MY_D_NFC )

else if ( tagtype & MY_D_MOVE_NFC )

PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);

else

else if ( tagtype & MY_D_MOVE_NFC )

PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);

else

- PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);

+ PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype);

return 0;

}

static int ulc_print_3deskey( uint8_t *data){

return 0;

}

static int ulc_print_3deskey( uint8_t *data){

- PrintAndLog(" deskey1 [44/0x2C]: %s [%.4s]", sprint_hex(data ,4),data);

- 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(" deskey1 [44/0x2C] : %s [%.4s]", sprint_hex(data ,4),data);

+ 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, 8), 16));

return 0;

}

PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));

return 0;

}

static int ulc_print_configuration( uint8_t *data){

PrintAndLog("--- UL-C Configuration");

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), printBits(2, data));

+ PrintAndLog(" Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), printBits(2, data+4));

bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);

if ( validAuth )

bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);

if ( validAuth )

- PrintAndLog(" Auth0 [42/0x2A]: %s Page %d and above need authentication", sprint_hex(data+8, 4), data[8] );

+ PrintAndLog(" Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );

else{

if ( data[8] == 0){

else{

if ( data[8] == 0){

- PrintAndLog(" Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );

+ PrintAndLog(" Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );

} else {

- PrintAndLog(" Auth0 [42/0x2A]: %s auth byte is out-of-range", sprint_hex(data+8, 4) );

+ PrintAndLog(" Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );

}

- PrintAndLog(" Auth1 [43/0x2B]: %s %s",

+ PrintAndLog(" Auth1 [43/0x2B] : %s %s",

sprint_hex(data+12, 4),

(data[12] & 1) ? "write access restricted": "read and write access restricted"

);

return 0;

}

sprint_hex(data+12, 4),

(data[12] & 1) ? "write access restricted": "read and write access restricted"

);

return 0;

}

-static int ulev1_print_configuration( uint8_t *data){

+static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){

- PrintAndLog("\n--- UL-EV1 Configuration");

+ PrintAndLog("\n--- Tag Configuration");

bool strg_mod_en = (data[0] & 2);

uint8_t authlim = (data[4] & 0x07);

bool strg_mod_en = (data[0] & 2);

uint8_t authlim = (data[4] & 0x07);

bool prot = (data[4] & 0x80);

uint8_t vctid = data[5];

bool prot = (data[4] & 0x80);

uint8_t vctid = data[5];

- PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));

+ PrintAndLog(" cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));

if ( data[3] < 0xff )

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");

if ( data[3] < 0xff )

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");

- PrintAndLog(" cfg1 [17/0x11]: %s", sprint_hex(data+4, 4) );

+ PrintAndLog(" cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1, sprint_hex(data+4, 4) );

if ( authlim == 0)

PrintAndLog(" - Unlimited password attempts");

else

PrintAndLog(" - Max number of password attempts is %d", authlim);

PrintAndLog(" - user configuration %s", cfglck ? "permanently locked":"writeable");

PrintAndLog(" - %s access is protected with password", prot ? "read and write":"write");

if ( authlim == 0)

PrintAndLog(" - Unlimited password attempts");

else

PrintAndLog(" - Max number of password attempts is %d", authlim);

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");

- PrintAndLog(" PWD [18/0x12]: %s", sprint_hex(data+8, 4));

- PrintAndLog(" PACK [19/0x13]: %s", sprint_hex(data+12, 4));

+ PrintAndLog(" - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");

+ PrintAndLog(" PWD [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2, sprint_hex(data+8, 4));

+ PrintAndLog(" PACK [%u/0x%02X] : %s - (cannot be read)", startPage + 3, startPage + 3, sprint_hex(data+12, 2));

+ PrintAndLog(" RFU [%u/0x%02X] : %s- (cannot be read)", startPage + 3, startPage + 3, sprint_hex(data+12, 2));

return 0;

}

static int ulev1_print_counters(){

return 0;

}

static int ulev1_print_counters(){

- PrintAndLog("--- UL-EV1 Counters");

+ PrintAndLog("--- Tag Counters");

uint8_t tear[1] = {0};

uint8_t counter[3] = {0,0,0};

uint8_t tear[1] = {0};

uint8_t counter[3] = {0,0,0};

+ uint16_t len = 0;

for ( uint8_t i = 0; i<3; ++i) {

ulev1_readTearing(i,tear,sizeof(tear));

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");

+ len = ulev1_readCounter(i,counter, sizeof(counter) );

+ if (len == 3) {

+ PrintAndLog(" [%0d] : %s", i, sprint_hex(counter,3));

+ PrintAndLog(" - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");

+ }

}

- return 0;

+ return len;

}

static int ulev1_print_signature( uint8_t *data, uint8_t len){

}

static int ulev1_print_signature( uint8_t *data, uint8_t len){

- PrintAndLog("\n--- UL-EV1 Signature");

- PrintAndLog("IC signature public key name : NXP NTAG21x 2013");

+ PrintAndLog("\n--- Tag Signature");

+ //PrintAndLog("IC signature public key name : NXP NTAG21x 2013"); // don't know if there is other NXP public keys.. :(

PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");

PrintAndLog(" Elliptic curve parameters : secp128r1");

PrintAndLog(" Tag ECC Signature : %s", sprint_hex(data, len));

PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");

PrintAndLog(" Elliptic curve parameters : secp128r1");

PrintAndLog(" Tag ECC Signature : %s", sprint_hex(data, len));

}

static int ulev1_print_version(uint8_t *data){

}

static int ulev1_print_version(uint8_t *data){

- PrintAndLog("\n--- UL-EV1 / NTAG Version");

- PrintAndLog(" Raw bytes : %s", sprint_hex(data, 8) );

- PrintAndLog(" Vendor ID : %02X, Manufacturer: %s", data[1], getTagInfo(data[1]));

+ PrintAndLog("\n--- Tag Version");

+ PrintAndLog(" Raw bytes : %s",sprint_hex(data, 8) );

+ PrintAndLog(" Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));

PrintAndLog(" Product type : %s", getProductTypeStr(data[2]));

- PrintAndLog(" Product subtype : %02X %s", data[3], (data[3]==1) ?"17 pF":"50pF");

+ PrintAndLog(" Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");

PrintAndLog(" Major version : %02X", data[4]);

PrintAndLog(" Minor version : %02X", data[5]);

PrintAndLog(" Size : %s", getUlev1CardSizeStr(data[6]));

PrintAndLog(" Major version : %02X", data[4]);

PrintAndLog(" Minor version : %02X", data[5]);

PrintAndLog(" Size : %s", getUlev1CardSizeStr(data[6]));

uint8_t nonce1[11] = {0x00};

uint8_t nonce2[11] = {0x00};

int status = ul_select(&card);

uint8_t nonce1[11] = {0x00};

uint8_t nonce2[11] = {0x00};

int status = ul_select(&card);

- if ( status < 1 ){

- PrintAndLog("Error: couldn't select ulc_magic_test");

- ul_switch_off_field();

+ if ( !status ){

return UL_ERROR;

}

status = ulc_requestAuthentication(nonce1, sizeof(nonce1));

return UL_ERROR;

}

status = ulc_requestAuthentication(nonce1, sizeof(nonce1));

// 1) take present UID, and try to write it back. OBSOLETE

// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:

iso14a_card_select_t card;

// 1) take present UID, and try to write it back. OBSOLETE

// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:

iso14a_card_select_t card;

- int status = ul_select(&card);

- if ( status < 1 ){

- PrintAndLog("iso14443a card select failed");

- ul_switch_off_field();

+ if ( !ul_select(&card) )

return UL_ERROR;

- }

- status = ul_comp_write(0, NULL, 0);

+ int status = ul_comp_write(0, NULL, 0);

ul_switch_off_field();

if ( status == 0 )

ul_switch_off_field();

if ( status == 0 )

- return UL_MAGIC;

- return UL;

+ return MAGIC;

+ return 0;

}

-uint16_t GetHF14AMfU_Type(void){

+uint32_t GetHF14AMfU_Type(void){

TagTypeUL_t tagtype = UNKNOWN;

iso14a_card_select_t card;

TagTypeUL_t tagtype = UNKNOWN;

iso14a_card_select_t card;

int status = 0;

int len;

int status = 0;

int len;

- status = ul_select(&card);

- if ( status < 1 ){

- PrintAndLog("Error: couldn't select");

- ul_switch_off_field();

- return UL_ERROR;

- }

+ if (!ul_select(&card)) return UL_ERROR;

+

// Ultralight - ATQA / SAK

if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {

PrintAndLog("Tag is not Ultralight | NTAG | MY-D [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);

// Ultralight - ATQA / SAK

if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {

PrintAndLog("Tag is not Ultralight | NTAG | MY-D [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);

if ( card.uid[0] != 0x05) {

len = ulev1_getVersion(version, sizeof(version));

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: {

switch (len) {

case 0x0A: {

tagtype = UL_EV1_48;

else if ( version[2] == 0x03 && version[6] != 0x0B )

tagtype = UL_EV1_128;

tagtype = UL_EV1_48;

else if ( version[2] == 0x03 && version[6] != 0x0B )

tagtype = UL_EV1_128;

- else if ( version[2] == 0x04 && version[6] == 0x0F )

+ else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0B )

+ tagtype = NTAG_210;

+ else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0E )

+ tagtype = NTAG_212;

+ else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x0F )

tagtype = NTAG_213;

- else if ( version[2] == 0x04 && version[6] == 0x11 )

+ else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x11 )

tagtype = NTAG_215;

- else if ( version[2] == 0x04 && version[6] == 0x13 )

+ else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 )

tagtype = NTAG_216;

+ else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x13 )

+ tagtype = NTAG_I2C_1K;

+ else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x15 )

+ tagtype = NTAG_I2C_2K;

else if ( version[2] == 0x04 )

tagtype = NTAG;

else if ( version[2] == 0x04 )

tagtype = NTAG;

}

case 0x01: tagtype = UL_C; break;

case 0x00: tagtype = UL; break;

}

case 0x01: tagtype = UL_C; break;

case 0x00: tagtype = UL; break;

- case -1 : tagtype = (UL | UL_C); break; //when does this happen?

+ case -1 : tagtype = (UL | UL_C | NTAG_203); break; // could be UL | UL_C magic tags

default : tagtype = UNKNOWN; break;

}

default : tagtype = UNKNOWN; break;

}

- // UL-C test

- if (tagtype == (UL | UL_C)) {

- status = ul_select(&card);

- if ( status < 1 ){

- PrintAndLog("iso14443a card select failed (UL-C)");

+ // UL vs UL-C vs ntag203 test

+ if (tagtype & (UL | UL_C | NTAG_203)) {

+ if ( !ul_select(&card) ) return UL_ERROR;

+

+ // do UL_C check first...

+ uint8_t nonce[11] = {0x00};

+ status = ulc_requestAuthentication(nonce, sizeof(nonce));

+ ul_switch_off_field();

+ if (status > 1) {

+ tagtype = UL_C;

+ } else {

+ // need to re-select after authentication error

+ if ( !ul_select(&card) ) return UL_ERROR;

+

+ uint8_t data[16] = {0x00};

+ // read page 0x26-0x29 (last valid ntag203 page)

+ status = ul_read(0x26, data, sizeof(data));

+ if ( status <= 1 ) {

+ tagtype = UL;

+ } else {

+ // read page 0x30 (should error if it is a ntag203)

+ status = ul_read(0x30, data, sizeof(data));

+ if ( status <= 1 ){

+ tagtype = NTAG_203;

+ } else {

+ tagtype = UNKNOWN;

+ }

ul_switch_off_field();

- return UL_ERROR;

}

- uint8_t nonce1[11] = {0x00};

- status = ulc_requestAuthentication(nonce1, sizeof(nonce1));

- tagtype = ( status > 0 ) ? UL_C : UL;

-

- if (status != -1) ul_switch_off_field();

}

} else {

// Infinition MY-D tests Exam high nibble

uint8_t nib = (card.uid[1] & 0xf0) >> 4;

switch ( nib ){

case 1: tagtype = MY_D; break;

}

} else {

// Infinition MY-D tests Exam high nibble

uint8_t nib = (card.uid[1] & 0xf0) >> 4;

switch ( nib ){

case 1: tagtype = MY_D; break;

- case 2: tagtype = (MY_D | MY_D_NFC); break;

- case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break;

+ case 2: tagtype = (MY_D | MY_D_NFC); break; //notice: we can not currently distinguish between these two

+ case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; //notice: we can not currently distinguish between these two

}

- tagtype = (ul_magic_test() == UL_MAGIC) ? (tagtype | MAGIC) : tagtype;

- //if ((tagtype & UL)) tagtype = ul_magic_test();

-

+ tagtype |= ul_magic_test();

+ if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);

return tagtype;

}

return tagtype;

}

uint8_t authlim = 0xff;

uint8_t data[16] = {0x00};

iso14a_card_select_t card;

uint8_t authlim = 0xff;

uint8_t data[16] = {0x00};

iso14a_card_select_t card;

- uint8_t *key;

int status;

bool errors = false;

bool hasAuthKey = false;

int status;

bool errors = false;

bool hasAuthKey = false;

+ bool locked = false;

+ bool swapEndian = false;

uint8_t cmdp = 0;

- uint8_t datalen = 0;

+ uint8_t dataLen = 0;

uint8_t authenticationkey[16] = {0x00};

+ uint8_t *authkeyptr = authenticationkey;

+ uint8_t *key;

uint8_t pack[4] = {0,0,0,0};

+ int len = 0;

+ char tempStr[50];

while(param_getchar(Cmd, cmdp) != 0x00)

{

while(param_getchar(Cmd, cmdp) != 0x00)

{

return usage_hf_mfu_info();

case 'k':

case 'K':

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;

+ dataLen = param_getstr(Cmd, cmdp+1, tempStr);

+ if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length

+ errors = param_gethex(tempStr, 0, authenticationkey, dataLen);

+ dataLen /= 2; // handled as bytes from now on

+ } else {

+ PrintAndLog("\nERROR: Key is incorrect length\n");

+ errors = true;

}

- errors = true;

+ cmdp += 2;

+ hasAuthKey = true;

+ break;

+ case 'l':

+ case 'L':

+ swapEndian = true;

+ cmdp++;

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

//Validations

if(errors) return usage_hf_mfu_info();

//Validations

if(errors) return usage_hf_mfu_info();

-

+

TagTypeUL_t tagtype = GetHF14AMfU_Type();

if (tagtype == UL_ERROR) return -1;

TagTypeUL_t tagtype = GetHF14AMfU_Type();

if (tagtype == UL_ERROR) return -1;

PrintAndLog("-------------------------------------------------------------");

ul_print_type(tagtype, 6);

PrintAndLog("-------------------------------------------------------------");

ul_print_type(tagtype, 6);

- status = ul_select(&card);

- if ( status < 1 ){

- PrintAndLog("iso14443a card select failed");

- ul_switch_off_field();

- return status;

- }

+ // Swap endianness

+ if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );

- if ( hasAuthKey ) {

- if ((tagtype & UL_C))

- try3DesAuthentication(authenticationkey);

- else

- ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));

- }

+ if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

- // read pages 0,1,2,4 (should read 4pages)

+ // read pages 0,1,2,3 (should read 4pages)

status = ul_read(0, data, sizeof(data));

- if ( status == -1 ){

+ if ( status == -1 ) {

+ ul_switch_off_field();

PrintAndLog("Error: tag didn't answer to READ");

return status;

PrintAndLog("Error: tag didn't answer to READ");

return status;

+ } else if (status == 16) {

+ ul_print_default(data);

+ ndef_print_CC(data+12);

+ } else {

+ locked = true;

}

- ul_print_default(data);

-

- if ((tagtype & UL_C)){

+ // UL_C Specific

+ if ((tagtype & UL_C)) {

// read pages 0x28, 0x29, 0x2A, 0x2B

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 UL-C");

// read pages 0x28, 0x29, 0x2A, 0x2B

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 UL-C");

+ ul_switch_off_field();

return status;

}

return status;

}

- ulc_print_configuration(ulc_conf);

-

- if ((tagtype & MAGIC)){

+ if (status == 16) ulc_print_configuration(ulc_conf);

+ else locked = true;

+ if ((tagtype & MAGIC)) {

+ //just read key

uint8_t ulc_deskey[16] = {0x00};

status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));

uint8_t ulc_deskey[16] = {0x00};

status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));

- if ( status == -1 ){

+ if ( status == -1 ) {

+ ul_switch_off_field();

PrintAndLog("Error: tag didn't answer to READ magic");

return status;

}

PrintAndLog("Error: tag didn't answer to READ magic");

return status;

}

- ulc_print_3deskey(ulc_deskey);

+ if (status == 16) ulc_print_3deskey(ulc_deskey);

} else {

+ ul_switch_off_field();

// if we called info with key, just return

if ( hasAuthKey ) return 1;

// 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 ){

+ for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {

key = default_3des_keys[i];

- if (try3DesAuthentication(key) == 1){

- PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));

+ if (ulc_authentication(key, true)) {

+ PrintAndLog("Found default 3des key: ");

uint8_t keySwap[16];

memcpy(keySwap, SwapEndian64(key,16,8), 16);

ulc_print_3deskey(keySwap);

return 1;

uint8_t keySwap[16];

memcpy(keySwap, SwapEndian64(key,16,8), 16);

ulc_print_3deskey(keySwap);

return 1;

- }

+ }

}

+ return 1;

}

+ // do counters and signature first (don't neet auth)

+

+ // ul counters are different than ntag counters

if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {

- //do counters and signature first (don't neet auth)

- ulev1_print_counters();

+ if (ulev1_print_counters() != 3) {

+ // failed - re-select

+ if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

+ }

+ if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K ))) {

uint8_t ulev1_signature[32] = {0x00};

status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));

uint8_t ulev1_signature[32] = {0x00};

status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));

- if ( status == -1 ){

+ 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));

-

- uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x25;

- uint8_t ulev1_conf[16] = {0x00};

- status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));

- if ( status == -1 ){

- PrintAndLog("Error: tag didn't answer to READ EV1");

- return status;

}

- // 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);

+ if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));

+ else {

+ // re-select

+ if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

+ }

}

- 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 | NTAG_I2C_1K | NTAG_I2C_2K))) {

uint8_t version[10] = {0x00};

status = ulev1_getVersion(version, sizeof(version));

uint8_t version[10] = {0x00};

status = ulev1_getVersion(version, sizeof(version));

- if ( status == -1 ){

+ if ( status == -1 ) {

PrintAndLog("Error: tag didn't answer to GETVERSION");

+ ul_switch_off_field();

return status;

+ } else if (status == 10) {

+ ulev1_print_version(version);

+ } else {

+ locked = true;

+ if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

}

- ulev1_print_version(version);

- // if we called info with key, just return

- if ( hasAuthKey ) return 1;

+ uint8_t startconfigblock = 0;

+ uint8_t ulev1_conf[16] = {0x00};

+ // config blocks always are last 4 pages

+ for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)

+ if (tagtype & UL_TYPES_ARRAY[idx])

+ startconfigblock = UL_MEMORY_ARRAY[idx]-3;

+

+ if (startconfigblock){ // if we know where the config block is...

+ 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;

+ } else if (status == 16) {

+ // save AUTHENTICATION LIMITS for later:

+ authlim = (ulev1_conf[4] & 0x07);

+ ulev1_print_configuration(ulev1_conf, startconfigblock);

+ }

// AUTHLIMIT, (number of failed authentications)

// 0 = limitless.

// 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 && !hasAuthKey ) {

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 ){

+ 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));

+ 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;

PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);

break;

+ } else {

+ if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

}

- if (len > -1) ul_switch_off_field();

+ if (len < 1) PrintAndLog("password not known");

}

- 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");

- return status;

- }

- ntag_print_CC(cc);

- }

-

ul_switch_off_field();

+ if (locked) PrintAndLog("\nTag appears to be locked, try using the key to get more info");

PrintAndLog("");

return 1;

}

PrintAndLog("");

return 1;

}

return 0;

}

return 0;

}

-int usage_hf_mfu_info(void)

-{

+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("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("Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");

+ PrintAndLog("NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");

PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");

- PrintAndLog("Usage: hf mfu info k <key>");

+ PrintAndLog("Usage: hf mfu info k <key> l");

PrintAndLog(" Options : ");

- PrintAndLog(" k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");

+ PrintAndLog(" k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");

+ PrintAndLog(" l : (optional) swap entered key's endianness");

PrintAndLog("");

PrintAndLog(" sample : hf mfu info");

PrintAndLog("");

PrintAndLog(" sample : hf mfu info");

- PrintAndLog(" : hf mfu info k 11223344");

+ PrintAndLog(" : hf mfu info k 00112233445566778899AABBCCDDEEFF");

+ PrintAndLog(" : hf mfu info k AABBCCDDD");

return 0;

}

return 0;

}

-int usage_hf_mfu_dump(void)

-{

+int usage_hf_mfu_dump(void) {

PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");

+ 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("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 k <key> l 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> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");

+ PrintAndLog(" l : (optional) swap entered key's endianness");

+ 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");

PrintAndLog("");

PrintAndLog(" sample : hf mfu dump");

PrintAndLog(" : hf mfu dump n myfile");

PrintAndLog(" : hf mfu dump k 00112233445566778899AABBCCDDEEFF");

+ PrintAndLog(" : hf mfu dump k AABBCCDDD\n");

return 0;

}

//

// Mifare Ultralight / Ultralight-C / Ultralight-EV1

// Read and Dump Card Contents, using auto detection of tag size.

return 0;

}

//

// Mifare Ultralight / Ultralight-C / Ultralight-EV1

// Read and Dump Card Contents, using auto detection of tag size.

-//

-// TODO: take a password to read UL-C / UL-EV1 tags.

int CmdHF14AMfUDump(const char *Cmd){

FILE *fout;

char filename[FILE_PATH_SIZE] = {0x00};

char *fnameptr = filename;

int CmdHF14AMfUDump(const char *Cmd){

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;

uint8_t *lockbytes_t = NULL;

uint8_t lockbytes[2] = {0x00};

uint8_t *lockbytes_t2 = NULL;

bool bit[16] = {0x00};

bool bit2[16] = {0x00};

uint8_t data[1024] = {0x00};

bool bit[16] = {0x00};

bool bit2[16] = {0x00};

uint8_t data[1024] = {0x00};

- bool hasPwd = false;

+ bool hasAuthKey = false;

int i = 0;

int Pages = 16;

bool tmplockbit = false;

int i = 0;

int Pages = 16;

bool tmplockbit = false;

- uint8_t dataLen=0;

- uint8_t cmdp =0;

- uint8_t key[16] = {0x00};

- uint8_t *keyPtr = key;

+ uint8_t dataLen = 0;

+ uint8_t cmdp = 0;

+ uint8_t authenticationkey[16] = {0x00};

+ uint8_t *authKeyPtr = authenticationkey;

size_t fileNlen = 0;

bool errors = false;

bool swapEndian = false;

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)

{

while(param_getchar(Cmd, cmdp) != 0x00)

{

return usage_hf_mfu_dump();

case 'k':

case 'K':

return usage_hf_mfu_dump();

case 'k':

case 'K':

- dataLen = param_gethex(Cmd, cmdp+1, data, 32);

- if (dataLen) {

- errors = true;

+ dataLen = param_getstr(Cmd, cmdp+1, tempStr);

+ if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length

+ errors = param_gethex(tempStr, 0, authenticationkey, dataLen);

+ dataLen /= 2;

} else {

- memcpy(key, data, 16);

- }

+ PrintAndLog("\nERROR: Key is incorrect length\n");

+ errors = true;

+ }

cmdp += 2;

- hasPwd = true;

+ hasAuthKey = true;

+ break;

+ case 'l':

+ case 'L':

+ swapEndian = true;

+ cmdp++;

break;

case 'n':

case 'N':

break;

case 'n':

case 'N':

if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;

cmdp += 2;

break;

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));

break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

//Validations

if(errors) return usage_hf_mfu_dump();

//Validations

if(errors) return usage_hf_mfu_dump();

- if (swapEndian)

- keyPtr = SwapEndian64(data, 16, 8);

+ if (swapEndian && hasAuthKey)

+ authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);

TagTypeUL_t tagtype = GetHF14AMfU_Type();

if (tagtype == UL_ERROR) return -1;

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}};

- if ( hasPwd ) {

- c.arg[2] = 1;

- memcpy(c.d.asBytes, key, 16);

+ ul_print_type(tagtype, 0);

+ PrintAndLog("Reading tag memory...");

+ UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};

+ if ( hasAuthKey ) {

+ if (tagtype & UL_C)

+ c.arg[2] = 1; //UL_C auth

+ else

+ c.arg[2] = 2; //UL_EV1/NTAG auth

+

+ memcpy(c.d.asBytes, authKeyPtr, dataLen);

}

SendCommand(&c);

UsbCommand resp;

}

SendCommand(&c);

UsbCommand resp;

PrintAndLog("Command execute time-out");

return 1;

}

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;

}

PrintAndLog("Failed reading block: (%02x)", i);

return 1;

}

+ uint32_t startindex = resp.arg[2];

+ uint32_t bufferSize = resp.arg[1];

+ if (bufferSize > sizeof(data)) {

+ PrintAndLog("Data exceeded Buffer size!");

+ bufferSize = sizeof(data);

+ }

+ GetFromBigBuf(data, bufferSize, startindex);

+ WaitForResponse(CMD_ACK,NULL);

+

+ Pages = bufferSize/4;

// Load lock bytes.

int j = 0;

// Load lock bytes.

int j = 0;

}

// Load bottom lockbytes if available

}

// Load bottom lockbytes if available

+ // TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG

if ( Pages == 44 ) {

lockbytes_t2 = data + (40*4);

lockbytes2[0] = lockbytes_t2[2];

if ( Pages == 44 ) {

lockbytes_t2 = data + (40*4);

lockbytes2[0] = lockbytes_t2[2];

}

- // add keys

- if (hasPwd){

- memcpy(data + Pages*4, key, 16);

- Pages += 4;

+ // 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);

+ }

}

+

for (i = 0; i < Pages; ++i) {

if ( i < 3 ) {

PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));

for (i = 0; i < Pages; ++i) {

if ( i < 3 ) {

PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));

}

switch(i){

case 3: tmplockbit = bit[4]; break;

}

switch(i){

case 3: tmplockbit = bit[4]; break;

- case 4: tmplockbit = bit[3]; break;

- case 5: tmplockbit = bit[2]; break;

- case 6: tmplockbit = bit[1]; break;

- case 7: tmplockbit = bit[0]; break;

- case 8: tmplockbit = bit[15]; break;

+ case 4: tmplockbit = bit[3]; break;

+ case 5: tmplockbit = bit[2]; break;

+ case 6: tmplockbit = bit[1]; break;

+ case 7: tmplockbit = bit[0]; break;

+ case 8: tmplockbit = bit[15]; break;

case 9: tmplockbit = bit[14]; break;

case 10: tmplockbit = bit[13]; break;

case 11: tmplockbit = bit[12]; break;

case 9: tmplockbit = bit[14]; break;

case 10: tmplockbit = bit[13]; break;

case 11: tmplockbit = bit[12]; break;

case 24:

case 25:

case 26:

case 24:

case 25:

case 26:

- case 27: tmplockbit = bit2[4]; break;

+ case 27: tmplockbit = bit2[4]; break;

case 28:

case 29:

case 30:

case 28:

case 29:

case 30:

case 43: tmplockbit = bit2[9]; break; //auth1

default: break;

}

case 43: tmplockbit = bit2[9]; break; //auth1

default: break;

}

- PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);

- }

+ PrintAndLog("Block %02X:%s [%d] {%.4s}", i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);

+ }

// user supplied filename?

if (fileNlen < 1) {

// user supplied filename?

if (fileNlen < 1) {

if ((fout = fopen(filename,"wb")) == NULL) {

PrintAndLog("Could not create file name %s", filename);

if ((fout = fopen(filename,"wb")) == NULL) {

PrintAndLog("Could not create file name %s", filename);

- return 1;

+ return 1;

}

fwrite( data, 1, Pages*4, fout );

fclose(fout);

}

fwrite( data, 1, Pages*4, fout );

fclose(fout);

return 0;

}

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

//-------------------------------------------------------------------------------

// Ultralight C Methods

//-------------------------------------------------------------------------------

//

int CmdHF14AMfucAuth(const char *Cmd){

//

int CmdHF14AMfucAuth(const char *Cmd){

- uint8_t keyNo = 0;

+ uint8_t keyNo = 3;

bool errors = false;

char cmdp = param_getchar(Cmd, 0);

bool errors = false;

char cmdp = param_getchar(Cmd, 0);

//Change key to user defined one

if (cmdp == 'k' || cmdp == 'K'){

keyNo = param_get8(Cmd, 1);

//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;

}

errors = true;

}

uint8_t *key = default_3des_keys[keyNo];

}

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");

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);

-

- 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));

}

/**

}

/**

hasPwd = TRUE;

}

hasPwd = TRUE;

}

- //uint8_t *key2 = SwapEndian64(key, 16, 8);

//Read Block

UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};

//Read Block

UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};