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

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c

index 99070e18e8d847f0ecf0a61c22b29ce8fc7f9d47..ce7d1f935d9447d8baca20115b1bea327b9c876f 100644 (file)

--- a/client/cmdhficlass.c

+++ b/client/cmdhficlass.c

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

#include "usb_cmd.h"

#include "cmdhfmfu.h"

-#define llX PRIx64

-

static int CmdHelp(const char *Cmd);

#define ICLASS_KEYS_MAX 8

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

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

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

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

}

@@ -406,7 +412,7 @@ int CmdHFiClassDecrypt(const char *Cmd) {

fclose(f);

saveFile(outfilename,"bin", decrypted, blocknum*8);

-

+ free(decrypted);

return 0;

}

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

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

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

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

@@ -771,10 +777,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

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

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

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

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

}

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;

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

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

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

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

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

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

@@ -1168,7 +1179,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {

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

@@ -1209,7 +1220,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(" 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 +1255,6 @@ int CmdHFiClass_loclass(const char *Cmd) {

}

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;

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

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

}

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

}

int usage_hf_iclass_readtagfile() {

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

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;

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

@@ -1332,7 +1349,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';

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

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

return 0;

return uint_key;

}

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

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

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

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

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

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

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

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;