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

Merge branch 'master' into fix_iclass_sim

Browse source
This commit is contained in:
pwpiwi 2019-09-24 19:34:05 +02:00
commit 1963cc9fe0
1 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

52
client/loclass/elite_crack.c
View file

@ -306,8 +306,7 @@ static uint32_t startvalue = 0;
* @param keytable where to write found values. * @param keytable where to write found values.
* @return * @return
*/ */
int bruteforceItem(dumpdata item, uint16_t keytable[]) int bruteforceItem(dumpdata item, uint16_t keytable[]) {
{
int errors = 0; int errors = 0;
uint8_t key_sel_p[8] = { 0 }; uint8_t key_sel_p[8] = { 0 };
uint8_t div_key[8] = {0}; uint8_t div_key[8] = {0};
@ -319,6 +318,8 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
uint8_t key_index[8] = {0}; uint8_t key_index[8] = {0};
hash1(item.csn, key_index); hash1(item.csn, key_index);
printvar("CSN ", item.csn, 8);
printvar("HASH1", key_index, 8);
/* /*
* Determine which bytes to retrieve. A hash is typically * Determine which bytes to retrieve. A hash is typically
@ -337,20 +338,16 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue; if (keytable[key_index[i]] & (CRACKED | BEING_CRACKED)) continue;
bytes_to_recover[numbytes_to_recover++] = key_index[i]; if (numbytes_to_recover == 3) {
keytable[key_index[i]] |= BEING_CRACKED;
if(numbytes_to_recover > 3) {
prnlog("The CSN requires > 3 byte bruteforce, not supported"); prnlog("The CSN requires > 3 byte bruteforce, not supported");
printvar("CSN", item.csn,8);
printvar("HASH1", key_index,8);
//Before we exit, reset the 'BEING_CRACKED' to zero //Before we exit, reset the 'BEING_CRACKED' to zero
keytable[bytes_to_recover[0]] &= ~BEING_CRACKED; keytable[bytes_to_recover[0]] &= ~BEING_CRACKED;
keytable[bytes_to_recover[1]] &= ~BEING_CRACKED; keytable[bytes_to_recover[1]] &= ~BEING_CRACKED;
keytable[bytes_to_recover[2]] &= ~BEING_CRACKED; keytable[bytes_to_recover[2]] &= ~BEING_CRACKED;
return 1; return 1;
} else {
bytes_to_recover[numbytes_to_recover++] = key_index[i];
keytable[key_index[i]] |= BEING_CRACKED;
} }
} }
@ -368,7 +365,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
uint32_t endmask = 1 << 8*numbytes_to_recover; uint32_t endmask = 1 << 8*numbytes_to_recover;
for (int i = 0; i < numbytes_to_recover && numbytes_to_recover > 1; i++) { for (int i = 0; i < numbytes_to_recover; i++) {
prnlog("Bruteforcing byte %d", bytes_to_recover[i]); prnlog("Bruteforcing byte %d", bytes_to_recover[i]);
} }
@ -377,14 +374,18 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
//Update the keytable with the brute-values //Update the keytable with the brute-values
for(int i = 0 ; i < numbytes_to_recover; i++) { for(int i = 0 ; i < numbytes_to_recover; i++) {
keytable[bytes_to_recover[i]] &= 0xFF00; keytable[bytes_to_recover[i]] &= 0xFF00;
keytable[bytes_to_recover[i]] |= (brute >> (i*8) & 0xFF); keytable[bytes_to_recover[i]] |= ((brute >> (i*8)) & 0xFF);
} }
// Piece together the key // Piece together the key
key_sel[0] = keytable[key_index[0]] & 0xFF;key_sel[1] = keytable[key_index[1]] & 0xFF; key_sel[0] = keytable[key_index[0]] & 0xFF;
key_sel[2] = keytable[key_index[2]] & 0xFF;key_sel[3] = keytable[key_index[3]] & 0xFF; key_sel[1] = keytable[key_index[1]] & 0xFF;
key_sel[4] = keytable[key_index[4]] & 0xFF;key_sel[5] = keytable[key_index[5]] & 0xFF; key_sel[2] = keytable[key_index[2]] & 0xFF;
key_sel[6] = keytable[key_index[6]] & 0xFF;key_sel[7] = keytable[key_index[7]] & 0xFF; key_sel[3] = keytable[key_index[3]] & 0xFF;
key_sel[4] = keytable[key_index[4]] & 0xFF;
key_sel[5] = keytable[key_index[5]] & 0xFF;
key_sel[6] = keytable[key_index[6]] & 0xFF;
key_sel[7] = keytable[key_index[7]] & 0xFF;
//Permute from iclass format to standard format //Permute from iclass format to standard format
permutekey_rev(key_sel,key_sel_p); permutekey_rev(key_sel,key_sel_p);
@ -405,21 +406,21 @@ int bruteforceItem(dumpdata item, uint16_t keytable[])
fflush(stdout); fflush(stdout);
} }
} }
if (!found) { if (!found) {
prnlog("Failed to recover %d bytes using the following CSN",numbytes_to_recover); prnlog("\nFailed to recover %d bytes", numbytes_to_recover);
printvar("CSN",item.csn,8);
errors++; errors++;
//Before we exit, reset the 'BEING_CRACKED' to zero //Before we exit, reset the 'BEING_CRACKED' to zero
for (int i = 0; i < numbytes_to_recover; i++) { for (int i = 0; i < numbytes_to_recover; i++) {
keytable[bytes_to_recover[i]] &= 0xFF; keytable[bytes_to_recover[i]] &= ~BEING_CRACKED;
keytable[bytes_to_recover[i]] |= CRACK_FAILED;
} }
} else { } else {
for (int i = 0; i < numbytes_to_recover; i++) { for (int i = 0; i < numbytes_to_recover; i++) {
keytable[bytes_to_recover[i]] &= 0xFF; keytable[bytes_to_recover[i]] &= ~BEING_CRACKED;
keytable[bytes_to_recover[i]] |= CRACKED; keytable[bytes_to_recover[i]] |= CRACKED;
} }
} }
return errors; return errors;
} }
@ -521,12 +522,11 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
// master key calculation // master key calculation
uint8_t first16bytes[16] = {0}; uint8_t first16bytes[16] = {0};
for(i = 0 ; i < 16 ; i++) for (int i = 0; i < 16; i++) {
{
first16bytes[i] = keytable[i] & 0xFF; first16bytes[i] = keytable[i] & 0xFF;
if(!(keytable[i] & CRACKED)) if (!(keytable[i] & CRACKED)) {
{ prnlog("Error, we are missing byte %d, cannot calculate custom key.", i);
prnlog("Error, we are missing byte %d, custom key calculation will fail...", i); return 1;
} }
} }
errors += calculateMasterKey(first16bytes, NULL); errors += calculateMasterKey(first16bytes, NULL);