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

index 6c85e1c1100d8299310e2e3806227694f42ec475..05ca39e4e7e2f7c2963e0028925cced58d9f415d 100644 (file)

--- a/client/cmdhficlass.c

+++ b/client/cmdhficlass.c

@@ -33,8 +33,6 @@

#include "usb_cmd.h"

#include "cmdhfmfu.h"

#include "usb_cmd.h"

#include "cmdhfmfu.h"

-#define llX PRIx64

static int CmdHelp(const char *Cmd);

#define ICLASS_KEYS_MAX 8

static int CmdHelp(const char *Cmd);

#define ICLASS_KEYS_MAX 8

@@ -182,10 +180,10 @@ int CmdHFiClassSim(const char *Cmd) {

int HFiClassReader(const char *Cmd, bool loop, bool verbose) {

bool tagFound = false;

int HFiClassReader(const char *Cmd, bool loop, bool verbose) {

bool tagFound = false;

- UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN|

- FLAG_ICLASS_READER_CONF|FLAG_ICLASS_READER_AA}};

+ UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN |

+ FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AA |

+ FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY } };

// loop in client not device - else on windows have a communication error

- c.arg[0] |= FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY;

UsbCommand resp;

while(!ukbhit()){

SendCommand(&c);

UsbCommand resp;

while(!ukbhit()){

SendCommand(&c);

@@ -193,21 +191,30 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {

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

uint8_t *data = resp.d.asBytes;

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

uint8_t *data = resp.d.asBytes;

- if (verbose)

- PrintAndLog("Readstatus:%02x", readStatus);

- if( readStatus == 0){

- //Aborted

- if (verbose) PrintAndLog("Quitting...");

- return 0;

- }

- if( readStatus & FLAG_ICLASS_READER_CSN){

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

+ // no tag found

+ if( readStatus == 0) continue;

+ if( readStatus & FLAG_ICLASS_READER_CSN) {

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

tagFound = true;

}

tagFound = true;

}

- if( readStatus & FLAG_ICLASS_READER_CC) PrintAndLog("CC: %s",sprint_hex(data+16,8));

- if( readStatus & FLAG_ICLASS_READER_CONF){

+ if( readStatus & FLAG_ICLASS_READER_CC) {

+ PrintAndLog(" CC: %s",sprint_hex(data+16,8));

+ }

+ if( readStatus & FLAG_ICLASS_READER_CONF) {

printIclassDumpInfo(data);

}

printIclassDumpInfo(data);

}

+ if (readStatus & FLAG_ICLASS_READER_AA) {

+ bool legacy = true;

+ PrintAndLog(" AppIA: %s",sprint_hex(data+8*5,8));

+ for (int i = 0; i<8; i++) {

+ if (data[8*5+i] != 0xFF) {

+ legacy = false;

+ }

+ PrintAndLog(" : Possible iClass %s",(legacy) ? "(legacy tag)" : "(NOT legacy tag)");

+ }

if (tagFound && !loop) return 1;

} else {

if (verbose) PrintAndLog("Command execute timeout");

if (tagFound && !loop) return 1;

} else {

if (verbose) PrintAndLog("Command execute timeout");

@@ -283,8 +290,13 @@ int CmdHFiClassELoad(const char *Cmd) {

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

- uint8_t *dump = malloc(fsize);

+ if (fsize < 0) {

+ PrintAndLog("Error, when getting filesize");

+ fclose(f);

+ return 1;

+ }

+ uint8_t *dump = malloc(fsize);

size_t bytes_read = fread(dump, 1, fsize, f);

fclose(f);

size_t bytes_read = fread(dump, 1, fsize, f);

fclose(f);

@@ -368,10 +380,13 @@ int CmdHFiClassDecrypt(const char *Cmd) {

//Open the tagdump-file

FILE *f;

char filename[FILE_PATH_SIZE];

//Open the tagdump-file

FILE *f;

char filename[FILE_PATH_SIZE];

- if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0)

- {

+ if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0) {

f = fopen(filename, "rb");

- }else{

+ if ( f == NULL ) {

+ PrintAndLog("Could not find file %s", filename);

+ return 1;

+ }

+ } else {

return usage_hf_iclass_decrypt();

}

return usage_hf_iclass_decrypt();

}

@@ -591,7 +606,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {

errors = param_gethex(tempStr, 0, CreditKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, CreditKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -625,7 +640,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -771,10 +786,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {

if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);

if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);

// print the dump

if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);

if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);

// print the dump

- printf("CSN |00| %02X %02X %02X %02X %02X %02X %02X %02X |\n",tag_data[0],tag_data[1],tag_data[2]

- ,tag_data[3],tag_data[4],tag_data[5],tag_data[6],tag_data[7]);

- printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8);

+ printf("------+--+-------------------------+\n");

+ printf("CSN |00| %s|\n",sprint_hex(tag_data, 8));

+ printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);

if (filename[0] == 0){

snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",

tag_data[0],tag_data[1],tag_data[2],tag_data[3],

if (filename[0] == 0){

snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",

tag_data[0],tag_data[1],tag_data[2],tag_data[3],

@@ -884,7 +899,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -933,7 +948,7 @@ int usage_hf_iclass_clone(void) {

}

int CmdHFiClassCloneTag(const char *Cmd) {

}

int CmdHFiClassCloneTag(const char *Cmd) {

- char filename[FILE_PATH_SIZE];

+ char filename[FILE_PATH_SIZE] = {0};

char tempStr[50]={0};

uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

uint8_t keyNbr = 0;

char tempStr[50]={0};

uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

uint8_t keyNbr = 0;

@@ -987,7 +1002,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -1038,6 +1053,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {

if (startblock<5) {

PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4");

if (startblock<5) {

PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4");

+ fclose(f);

return 0;

}

// now read data from the file from block 6 --- 19

return 0;

}

// now read data from the file from block 6 --- 19

@@ -1046,7 +1062,11 @@ int CmdHFiClassCloneTag(const char *Cmd) {

// else we have to create a share memory

int i;

fseek(f,startblock*8,SEEK_SET);

// else we have to create a share memory

int i;

fseek(f,startblock*8,SEEK_SET);

- fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f);

+ if ( fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f) == 0 ) {

+ PrintAndLog("File reading error.");

+ fclose(f);

+ return 2;

+ }

uint8_t MAC[4]={0x00,0x00,0x00,0x00};

uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

uint8_t MAC[4]={0x00,0x00,0x00,0x00};

uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

@@ -1084,12 +1104,19 @@ int CmdHFiClassCloneTag(const char *Cmd) {

return 1;

}

return 1;

}

-static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose) {

+static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {

uint8_t MAC[4]={0x00,0x00,0x00,0x00};

uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

uint8_t MAC[4]={0x00,0x00,0x00,0x00};

uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

- if (!select_and_auth(KEY, MAC, div_key, (keyType==0x18), elite, rawkey, verbose))

- return 0;

+ if (auth) {

+ if (!select_and_auth(KEY, MAC, div_key, (keyType==0x18), elite, rawkey, verbose))

+ return 0;

+ } else {

+ uint8_t CSN[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

+ uint8_t CCNR[12]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};

+ if (!select_only(CSN, CCNR, (keyType==0x18), verbose))

+ return 0;

+ }

UsbCommand resp;

UsbCommand w = {CMD_ICLASS_READBLOCK, {blockno}};

UsbCommand resp;

UsbCommand w = {CMD_ICLASS_READBLOCK, {blockno}};

@@ -1135,6 +1162,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {

bool elite = false;

bool rawkey = false;

bool errors = false;

bool elite = false;

bool rawkey = false;

bool errors = false;

+ bool auth = false;

uint8_t cmdp = 0;

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

{

uint8_t cmdp = 0;

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

{

@@ -1163,12 +1191,13 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {

break;

case 'k':

case 'K':

break;

case 'k':

case 'K':

+ auth = true;

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

if (dataLen == 16) {

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

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

if (dataLen == 16) {

errors = param_gethex(tempStr, 0, KEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(KEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -1193,9 +1222,10 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {

if(errors) return usage_hf_iclass_readblock();

}

if(errors) return usage_hf_iclass_readblock();

}

- if (cmdp < 4) return usage_hf_iclass_readblock();

- return ReadBlock(KEY, blockno, keyType, elite, rawkey, true);

+ if (cmdp < 2) return usage_hf_iclass_readblock();

+ if (!auth)

+ PrintAndLog("warning: no authentication used with read, only a few specific blocks can be read accurately without authentication.");

+ return ReadBlock(KEY, blockno, keyType, elite, rawkey, true, auth);

}

int CmdHFiClass_loclass(const char *Cmd) {

}

int CmdHFiClass_loclass(const char *Cmd) {

@@ -1209,7 +1239,7 @@ int CmdHFiClass_loclass(const char *Cmd) {

PrintAndLog("f <filename> Bruteforce iclass dumpfile");

PrintAndLog(" An iclass dumpfile is assumed to consist of an arbitrary number of");

PrintAndLog(" malicious CSNs, and their protocol responses");

PrintAndLog("f <filename> Bruteforce iclass dumpfile");

PrintAndLog(" An iclass dumpfile is assumed to consist of an arbitrary number of");

PrintAndLog(" malicious CSNs, and their protocol responses");

- PrintAndLog(" The the binary format of the file is expected to be as follows: ");

+ PrintAndLog(" The binary format of the file is expected to be as follows: ");

PrintAndLog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");

@@ -1244,7 +1274,6 @@ int CmdHFiClass_loclass(const char *Cmd) {

}

void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {

}

void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {

- uint8_t blockdata[8];

uint8_t mem_config;

memcpy(&mem_config, iclass_dump + 13,1);

uint8_t maxmemcount;

uint8_t mem_config;

memcpy(&mem_config, iclass_dump + 13,1);

uint8_t maxmemcount;

@@ -1259,18 +1288,19 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e

startblock = 6;

if ((endblock > maxmemcount) || (endblock == 0))

endblock = maxmemcount;

startblock = 6;

if ((endblock > maxmemcount) || (endblock == 0))

endblock = maxmemcount;

- if (endblock > filemaxblock)

+ // remember endblock need to relate to zero-index arrays.

+ if (endblock > filemaxblock-1)

endblock = filemaxblock;

int i = startblock;

- int j;

- while (i <= endblock){

- printf("Block |%02X| ",i);

- memcpy(blockdata,iclass_dump + (i * 8),8);

- for (j = 0;j < 8;j++)

- printf("%02X ",blockdata[j]);

- printf("|\n");

+ printf("------+--+-------------------------+\n");

+ while (i <= endblock) {

+ uint8_t *blk = iclass_dump + (i * 8);

+ printf("Block |%02X| %s|\n", i, sprint_hex(blk, 8) );

i++;

}

i++;

}

+ printf("------+--+-------------------------+\n");

}

int usage_hf_iclass_readtagfile() {

}

int usage_hf_iclass_readtagfile() {

@@ -1305,13 +1335,19 @@ int CmdHFiClassReadTagFile(const char *Cmd) {

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

- uint8_t *dump = malloc(fsize);

+ if ( fsize < 0 ) {

+ PrintAndLog("Error, when getting filesize");

+ fclose(f);

+ return 1;

+ }

+ uint8_t *dump = malloc(fsize);

size_t bytes_read = fread(dump, 1, fsize, f);

fclose(f);

uint8_t *csn = dump;

size_t bytes_read = fread(dump, 1, fsize, f);

fclose(f);

uint8_t *csn = dump;

- printf("CSN [00] | %02X %02X %02X %02X %02X %02X %02X %02X |\n",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);

+ printf("------+--+-------------------------+\n");

+ printf("CSN |00| %s|\n", sprint_hex(csn, 8) );

// printIclassDumpInfo(dump);

printIclassDumpContents(dump,startblock,endblock,bytes_read);

free(dump);

// printIclassDumpInfo(dump);

printIclassDumpContents(dump,startblock,endblock,bytes_read);

free(dump);

@@ -1332,7 +1368,7 @@ uint64_t hexarray_to_uint64(uint8_t *key) {

for (int i = 0;i < 8;i++)

sprintf(&temp[(i *2)],"%02X",key[i]);

temp[16] = '\0';

for (int i = 0;i < 8;i++)

sprintf(&temp[(i *2)],"%02X",key[i]);

temp[16] = '\0';

- if (sscanf(temp,"%016"llX,&uint_key) < 1)

+ if (sscanf(temp,"%016" SCNx64,&uint_key) < 1)

return 0;

return uint_key;

}

return 0;

return uint_key;

}

@@ -1431,7 +1467,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {

errors = param_gethex(tempStr, 0, NEWKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, NEWKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: NewKey Nbr is invalid\n");

memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: NewKey Nbr is invalid\n");

@@ -1450,7 +1486,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {

errors = param_gethex(tempStr, 0, OLDKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

errors = param_gethex(tempStr, 0, OLDKEY, dataLen);

} else if (dataLen == 1) {

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr <= ICLASS_KEYS_MAX) {

+ if (keyNbr < ICLASS_KEYS_MAX) {

memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);

} else {

PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");

@@ -1498,6 +1534,12 @@ static int loadKeys(char *filename) {

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

long fsize = ftell(f);

fseek(f, 0, SEEK_SET);

+ if ( fsize < 0 ) {

+ PrintAndLog("Error, when getting filesize");

+ fclose(f);

+ return 1;

+ }

uint8_t *dump = malloc(fsize);

size_t bytes_read = fread(dump, 1, fsize, f);

uint8_t *dump = malloc(fsize);

size_t bytes_read = fread(dump, 1, fsize, f);

@@ -1590,8 +1632,8 @@ int CmdHFiClassManageKeys(const char *Cmd) {

case 'n':

case 'N':

keyNbr = param_get8(Cmd, cmdp+1);

case 'n':

case 'N':

keyNbr = param_get8(Cmd, cmdp+1);

- if (keyNbr < 0) {

- PrintAndLog("Wrong block number");

+ if (keyNbr >= ICLASS_KEYS_MAX) {

+ PrintAndLog("Invalid block number");

errors = true;

}

cmdp += 2;

errors = true;

}

cmdp += 2;