github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix 'hf iclass chk' (#894)

Browse source 
* Check for Credidt Keys as well
* reduce authentication tries from 6 to 3
* correct text in 'hf iclass clone' for 'l' parameter
* some reformatting and whitespace fixes
This commit is contained in:
pwpiwi 2019-12-09 08:27:42 +01:00 • committed by GitHub
commit e73c9f1bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

25
armsrc/iclass.c
View file

@ -646,8 +646,8 @@ static void ReaderTransmitIClass(uint8_t *frame, int len, uint32_t *start_time)
static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, size_t max_resp_size,
uint8_t expected_size, uint8_t retries, uint32_t start_time, uint32_t timeout, uint32_t *eof_time) {
while (retries-- > 0) {
uint8_t expected_size, uint8_t tries, uint32_t start_time, uint32_t timeout, uint32_t *eof_time) {
while (tries-- > 0) {
ReaderTransmitIClass(command, cmdsize, &start_time);
if (expected_size == GetIso15693AnswerFromTag(resp, max_resp_size, timeout, eof_time)) {
return true;
@ -781,7 +781,7 @@ void iClass_Check(uint8_t *NRMAC) {
uint8_t resp[4];
memcpy(check+1, NRMAC, 8);
uint32_t eof_time;
bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 6, 0, ICLASS_READER_TIMEOUT_OTHERS, &eof_time);
bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 3, 0, ICLASS_READER_TIMEOUT_OTHERS, &eof_time);
cmd_send(CMD_ACK, isOK, 0, 0, resp, sizeof(resp));
}
@ -793,7 +793,7 @@ void iClass_Readcheck(uint8_t block, bool use_credit_key) {
}
uint8_t resp[8];
uint32_t eof_time;
bool isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 8, 6, 0, ICLASS_READER_TIMEOUT_OTHERS, &eof_time);
bool isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 8, 3, 0, ICLASS_READER_TIMEOUT_OTHERS, &eof_time);
cmd_send(CMD_ACK, isOK, 0, 0, resp, sizeof(resp));
}
@ -892,15 +892,15 @@ void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
LED_A_ON();
int i;
int written = 0;
int total_block = (endblock - startblock) + 1;
for (i = 0; i < total_block; i++) {
int total_blocks = (endblock - startblock) + 1;
for (i = 0; i < total_blocks; i++) {
// block number
if (iClass_WriteBlock_ext(i+startblock, data + (i*12))){
Dbprintf("Write block [%02x] successful", i + startblock);
written++;
} else {
if (iClass_WriteBlock_ext(i+startblock, data + (i*12))){
Dbprintf("Write block [%02x] successful", i + startblock);
written++;
@ -908,8 +908,8 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
Dbprintf("Write block [%02x] failed", i + startblock);
}
}
}
if (written == total_block)
if (written == total_blocks)
Dbprintf("Clone complete");
else
Dbprintf("Clone incomplete");
@ -917,5 +917,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_D_OFF();
LED_A_OFF();
}

47
client/cmdhficlass.c
View file

@ -1205,7 +1205,7 @@ static void usage_hf_iclass_clone(void) {
PrintAndLog("Options:");
PrintAndLog(" f <filename>: specify a filename to clone from");
PrintAndLog(" b <Block> : The first block to clone as 2 hex symbols");
PrintAndLog(" l <Last Blk>: Set the Data to write as 16 hex symbols");
PrintAndLog(" l <Last Blk>: The last block to clone as 2 hex symbols");
PrintAndLog(" k <Key> : Access Key as 16 hex symbols or 1 hex to select key from memory");
PrintAndLog(" c : If 'c' is specified, the key set is assumed to be the credit key\n");
PrintAndLog(" e : If 'e' is specified, elite computations applied to key");
@ -1287,7 +1287,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
case 'l':
case 'L':
if (param_gethex(Cmd, cmdp+1, &endblock, 2)) {
PrintAndLog("Start Block No must include 2 HEX symbols\n");
PrintAndLog("Last Block No must include 2 HEX symbols\n");
errors = true;
}
cmdp += 2;
@ -1376,12 +1376,12 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
UsbCommand resp;
SendCommand(&w);
if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
{
if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
PrintAndLog("Command execute timeout");
DropField();
return 0;
}
return 1;
}
@ -1996,7 +1996,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
uint8_t fileNameLen = 0;
char buf[17];
uint8_t *keyBlock = NULL, *p;
int keyitems = 0, keycnt = 0;
int keycnt = 0;
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch (param_getchar(Cmd, cmdp)) {
@ -2036,7 +2036,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
}
if (!(f = fopen(filename , "r"))) {
PrintAndLog("File: %s: not found or locked.", filename);
PrintAndLog("File %s not found or locked.", filename);
return 1;
}
@ -2055,7 +2055,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
buf[16] = 0;
p = realloc(keyBlock, 8 * (keyitems += 64));
p = realloc(keyBlock, 8 * (keycnt + 1));
if (!p) {
PrintAndLog("Cannot allocate memory for default keys");
free(keyBlock);
@ -2067,60 +2067,39 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
memset(keyBlock + 8 * keycnt, 0, 8);
num_to_bytes(strtoull(buf, NULL, 16), 8, keyBlock + 8 * keycnt);
//PrintAndLog("check key[%2d] %016" PRIx64, keycnt, bytes_to_num(keyBlock + 8*keycnt, 8));
keycnt++;
memset(buf, 0, sizeof(buf));
}
fclose(f);
PrintAndLog("Loaded %2d keys from %s", keycnt, filename);
// time
uint64_t t1 = msclock();
uint8_t CSN[8];
if (!iClass_select(CSN, false, true, true)) {
PrintAndLog("Couldn't select card");
DropField();
return 0;
}
for (uint32_t c = 0; c < keycnt; c++) {
printf("."); fflush(stdout);
if (ukbhit()) {
int gc = getchar(); (void)gc;
printf("\naborted via keyboard!\n");
break;
}
memcpy(key, keyBlock + 8 * c, 8);
// debit key
if (!iClass_authenticate(CSN, key, mac, div_key, false, use_elite, use_raw, false, false))
continue;
// key found.
PrintAndLog("\n--------------------------------------------------------");
PrintAndLog(" Found AA1 debit key\t\t[%s]", sprint_hex(key, 8));
if (iClass_authenticate(CSN, key, mac, div_key, false, use_elite, use_raw, false, false)) {
PrintAndLog("\n Found AA1 debit key\t\t[%s]", sprint_hex(key, 8));
found_debit = true;
}
// credit key
if (!iClass_authenticate(CSN, key, mac, div_key, true, use_elite, use_raw, false, false))
continue;
// key found
PrintAndLog("\n--------------------------------------------------------");
PrintAndLog(" Found AA2 credit key\t\t[%s]", sprint_hex(key, 8));
if (iClass_authenticate(CSN, key, mac, div_key, true, use_elite, use_raw, false, false)) {
PrintAndLog("\n Found AA2 credit key\t\t[%s]", sprint_hex(key, 8));
found_credit = true;
}
// both keys found.
if (found_debit && found_credit)
break;
}
t1 = msclock() - t1;
PrintAndLog("\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
DropField();
free(keyBlock);
PrintAndLog("");

11
client/util.c
View file

@ -169,23 +169,22 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex
const size_t min_str_len, const size_t spaces_between, bool uppercase) {
char *tmp = (char *)buf;
size_t i;
memset(tmp, 0x00, hex_max_len);
int maxLen = (hex_len > hex_max_len) ? hex_max_len : hex_len;
for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
for (int i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
if (i != maxLen - 1)
for (int j = 0; j < spaces_between; j++)
sprintf(tmp + 2 + j, " ");
}
i *= (2 + spaces_between);
int minStrLen = min_str_len > i ? min_str_len : 0;
size_t len = strlen(tmp);
int minStrLen = min_str_len > len ? min_str_len : 0;
if (minStrLen > hex_max_len)
minStrLen = hex_max_len;
for(; i < minStrLen; i++, tmp += 1)
for (int i = len; i < minStrLen; i++, tmp += 1)
sprintf(tmp, " ");
return;