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

index 48f549ba8334f4ecbd0fb97180c120ace6a73993..54a30c7739c8c9a8e45f2575adc7ba0a1f2af416 100644 (file)

--- a/client/cmdhfmfu.c

+++ b/client/cmdhfmfu.c

@@ -7,8 +7,16 @@

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

// High frequency MIFARE ULTRALIGHT (C) commands

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

// High frequency MIFARE ULTRALIGHT (C) commands

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

-#include "loclass/des.h"

#include "cmdhfmfu.h"

+#include <stdint.h>

+#include <stdio.h>

+#include "proxmark3.h"

+#include "usb_cmd.h"

+#include "cmdmain.h"

+#include "ui.h"

+#include "loclass/des.h"

#include "cmdhfmf.h"

#include "cmdhf14a.h"

#include "mifare.h"

#include "cmdhfmf.h"

#include "cmdhf14a.h"

#include "mifare.h"

@@ -41,7 +49,7 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {

{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF } // 11 22 33

};

{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF } // 11 22 33

};

-#define KEYS_PWD_COUNT 10

+#define KEYS_PWD_COUNT 6

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

@@ -50,20 +58,15 @@ uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {

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

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

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

+#define MAX_UL_TYPES 18

+uint32_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, MY_D_MOVE_LEAN, FUDAN_UL};

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,

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_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN};

+ MAX_NTAG_215, MAX_NTAG_216, MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};

static int CmdHelp(const char *Cmd);

@@ -276,6 +279,38 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){

return len;

}

return len;

}

+// Fudan check checks for which error is given for a command with incorrect crc

+// NXP UL chip responds with 01, fudan 00.

+// other possible checks:

+// send a0 + crc

+// UL responds with 00, fudan doesn't respond

+// or

+// send a200 + crc

+// UL doesn't respond, fudan responds with 00

+// or

+// send 300000 + crc (read with extra byte(s))

+// UL responds with read of page 0, fudan doesn't respond.

+//

+// make sure field is off before calling this function

+static int ul_fudan_check( void ){

+ iso14a_card_select_t card;

+ if ( !ul_select(&card) )

+ return UL_ERROR;

+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT, 4, 0}};

+ uint8_t cmd[4] = {0x30,0x00,0x02,0xa7}; //wrong crc on purpose should be 0xa8

+ memcpy(c.d.asBytes, cmd, 4);

+ clearCommandBuffer();

+ SendCommand(&c);

+ UsbCommand resp;

+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;

+ if (resp.arg[0] != 1) return UL_ERROR;

+ return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP

static int ul_print_default( uint8_t *data){

uint8_t uid[7];

static int ul_print_default( uint8_t *data){

uint8_t uid[7];

@@ -389,6 +424,8 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){

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

else if ( tagtype & MY_D_MOVE_LEAN )

PrintAndLog("%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);

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

else if ( tagtype & MY_D_MOVE_LEAN )

PrintAndLog("%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);

+ else if ( tagtype & FUDAN_UL )

+ PrintAndLog("%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

else

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

return 0;

else

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

return 0;

@@ -622,6 +659,10 @@ uint32_t GetHF14AMfU_Type(void){

ul_switch_off_field();

}

ul_switch_off_field();

}

+ if (tagtype & UL) {

+ tagtype = ul_fudan_check();

+ ul_switch_off_field();

+ }

} else {

ul_switch_off_field();

// Infinition MY-D tests Exam high nibble

} else {

ul_switch_off_field();

// Infinition MY-D tests Exam high nibble

@@ -870,10 +911,6 @@ int CmdHF14AMfUWrBl(const char *Cmd){

uint8_t authenticationkey[16] = {0x00};

uint8_t *authKeyPtr = authenticationkey;

uint8_t authenticationkey[16] = {0x00};

uint8_t *authKeyPtr = authenticationkey;

- // starting with getting tagtype

- TagTypeUL_t tagtype = GetHF14AMfU_Type();

- if (tagtype == UL_ERROR) return -1;

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

{

switch(param_getchar(Cmd, cmdp))

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

{

switch(param_getchar(Cmd, cmdp))

@@ -905,21 +942,10 @@ int CmdHF14AMfUWrBl(const char *Cmd){

case 'b':

case 'B':

blockNo = param_get8(Cmd, cmdp+1);

case 'b':

case 'B':

blockNo = param_get8(Cmd, cmdp+1);

- uint8_t maxblockno = 0;

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

- if (tagtype & UL_TYPES_ARRAY[idx])

- maxblockno = UL_MEMORY_ARRAY[idx];

- }

if (blockNo < 0) {

PrintAndLog("Wrong block number");

errors = true;

}

if (blockNo < 0) {

PrintAndLog("Wrong block number");

errors = true;

}

- if (blockNo > maxblockno){

- PrintAndLog("block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);

- errors = true;

- }

cmdp += 2;

break;

case 'l':

cmdp += 2;

break;

case 'l':

@@ -946,6 +972,19 @@ int CmdHF14AMfUWrBl(const char *Cmd){

}

if ( blockNo == -1 ) return usage_hf_mfu_wrbl();

}

if ( blockNo == -1 ) return usage_hf_mfu_wrbl();

+ // starting with getting tagtype

+ TagTypeUL_t tagtype = GetHF14AMfU_Type();

+ if (tagtype == UL_ERROR) return -1;

+ uint8_t maxblockno = 0;

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

+ if (tagtype & UL_TYPES_ARRAY[idx])

+ maxblockno = UL_MEMORY_ARRAY[idx];

+ }

+ if (blockNo > maxblockno){

+ PrintAndLog("block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);

+ return usage_hf_mfu_wrbl();

+ }

// Swap endianness

if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);

// Swap endianness

if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);

@@ -997,10 +1036,6 @@ int CmdHF14AMfURdBl(const char *Cmd){

uint8_t authenticationkey[16] = {0x00};

uint8_t *authKeyPtr = authenticationkey;

uint8_t authenticationkey[16] = {0x00};

uint8_t *authKeyPtr = authenticationkey;

- // starting with getting tagtype

- TagTypeUL_t tagtype = GetHF14AMfU_Type();

- if (tagtype == UL_ERROR) return -1;

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

{

switch(param_getchar(Cmd, cmdp))

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

{

switch(param_getchar(Cmd, cmdp))

@@ -1032,21 +1067,10 @@ int CmdHF14AMfURdBl(const char *Cmd){

case 'b':

case 'B':

blockNo = param_get8(Cmd, cmdp+1);

case 'b':

case 'B':

blockNo = param_get8(Cmd, cmdp+1);

- uint8_t maxblockno = 0;

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

- if (tagtype & UL_TYPES_ARRAY[idx])

- maxblockno = UL_MEMORY_ARRAY[idx];

- }

if (blockNo < 0) {

PrintAndLog("Wrong block number");

errors = true;

}

if (blockNo < 0) {

PrintAndLog("Wrong block number");

errors = true;

}

- if (blockNo > maxblockno){

- PrintAndLog("block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);

- errors = true;

- }

cmdp += 2;

break;

case 'l':

cmdp += 2;

break;

case 'l':

@@ -1064,6 +1088,19 @@ int CmdHF14AMfURdBl(const char *Cmd){

}

if ( blockNo == -1 ) return usage_hf_mfu_rdbl();

}

if ( blockNo == -1 ) return usage_hf_mfu_rdbl();

+ // start with getting tagtype

+ TagTypeUL_t tagtype = GetHF14AMfU_Type();

+ if (tagtype == UL_ERROR) return -1;

+ uint8_t maxblockno = 0;

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

+ if (tagtype & UL_TYPES_ARRAY[idx])

+ maxblockno = UL_MEMORY_ARRAY[idx];

+ }

+ if (blockNo > maxblockno){

+ PrintAndLog("block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);

+ return usage_hf_mfu_rdbl();

+ }

// Swap endianness

if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);

// Swap endianness

if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);

@@ -1087,9 +1124,9 @@ int CmdHF14AMfURdBl(const char *Cmd){

uint8_t isOK = resp.arg[0] & 0xff;

if (isOK) {

uint8_t *data = resp.d.asBytes;

uint8_t isOK = resp.arg[0] & 0xff;

if (isOK) {

uint8_t *data = resp.d.asBytes;

- PrintAndLog("\nBlock# | Data | Ascii");

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

- PrintAndLog("%02d/0x%02X | %s| %.4s\n", blockNo, blockNo, sprint_hex(data, 4), data);

+ PrintAndLog("\n Block# | Data | Ascii");

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

+ PrintAndLog(" %02d/0x%02X | %s| %.4s\n", blockNo, blockNo, sprint_hex(data, 4), data);

}

else {

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

}

else {

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

@@ -1196,6 +1233,7 @@ int CmdHF14AMfUDump(const char *Cmd){

bool manualPages = false;

uint8_t startPage = 0;

char tempStr[50];

bool manualPages = false;

uint8_t startPage = 0;

char tempStr[50];

+ unsigned char cleanASCII[4];

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

{

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

{

@@ -1334,11 +1372,11 @@ int CmdHF14AMfUDump(const char *Cmd){

}

- PrintAndLog("\nBlock# | Data |lck| Ascii");

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

+ PrintAndLog("\n Block# | Data |lck| Ascii");

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

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

if ( i < 3 ) {

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

if ( i < 3 ) {

- PrintAndLog("%02d/0x%02X | %s| | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4));

+ PrintAndLog("%3d/0x%02X | %s| | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4));

continue;

}

switch(i){

continue;

}

switch(i){

@@ -1385,7 +1423,12 @@ int CmdHF14AMfUDump(const char *Cmd){

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

default: break;

}

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

default: break;

}

- PrintAndLog("%02d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);

+ // convert unprintable characters and line breaks to dots

+ memcpy(cleanASCII, data+i*4, 4);

+ clean_ascii(cleanASCII, 4);

+ PrintAndLog("%3d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, cleanASCII);

}

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

}

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

@@ -1426,7 +1469,7 @@ int CmdHF14AMfucAuth(const char *Cmd){

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

+ if(keyNo > KEYS_3DES_COUNT-1)

errors = true;

}

errors = true;

}