mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-24 06:55:27 -07:00
fix bug: parity attack for any block.
This commit is contained in:
douniwan5788
parent
b75f4c6f10
commit
7034f48582
4 changed files with 162 additions and 102 deletions
|
|
@ -88,8 +88,16 @@ start:
|
|||
// error
|
||||
if (isOK != 1) return 1;
|
||||
|
||||
// execute original function from util nonce2key
|
||||
if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {
|
||||
if (par_list == 0)
|
||||
{
|
||||
//parity is all zero,try special attack!just wait for few more seconds...
|
||||
isOK = magic_nonce2key(uid, nt, nr, par_list, ks_list, &r_key, blockNo, keyType);
|
||||
} else {
|
||||
// execute original function from util nonce2key
|
||||
isOK = nonce2key(uid, nt, nr, par_list, ks_list, &r_key);
|
||||
}
|
||||
|
||||
if (isOK) {
|
||||
isOK = 2;
|
||||
PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
|
||||
PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
|
||||
|
|
|
|||
|
|
@ -67,6 +67,139 @@ void* nested_worker_thread(void *arg)
|
|||
return statelist->head.slhead;
|
||||
}
|
||||
|
||||
int compar_state(const void * a, const void * b) {
|
||||
// didn't work: (the result is truncated to 32 bits)
|
||||
//return (*(int64_t*)b - *(int64_t*)a);
|
||||
|
||||
// better:
|
||||
if (*(int64_t*)b == *(int64_t*)a) return 0;
|
||||
else if (*(int64_t*)b > *(int64_t*)a) return 1;
|
||||
else return -1;
|
||||
}
|
||||
|
||||
int magic_nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key, uint32_t blockNo, uint8_t keyType)
|
||||
{
|
||||
struct Crypto1State *state;
|
||||
uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2;
|
||||
byte_t bt, ks3x[8], par[8][8];
|
||||
uint64_t key_recovered;
|
||||
int64_t *state_s;
|
||||
static uint32_t last_uid;
|
||||
static int64_t *last_keylist;
|
||||
rr = 0;
|
||||
|
||||
if (last_uid != uid && last_keylist != NULL)
|
||||
{
|
||||
free(last_keylist);
|
||||
last_keylist = NULL;
|
||||
}
|
||||
last_uid = uid;
|
||||
|
||||
// Reset the last three significant bits of the reader nonce
|
||||
nr &= 0xffffff1f;
|
||||
|
||||
PrintAndLog("\nuid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n\n",uid,nt,par_info,ks_info,nr);
|
||||
|
||||
for (pos=0; pos<8; pos++)
|
||||
{
|
||||
ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
|
||||
bt = (par_info >> (pos*8)) & 0xff;
|
||||
for (i=0; i<8; i++)
|
||||
{
|
||||
par[7-pos][i] = (bt >> i) & 0x01;
|
||||
}
|
||||
}
|
||||
|
||||
printf("|diff|{nr} |ks3|ks3^5|parity |\n");
|
||||
printf("+----+--------+---+-----+---------------+\n");
|
||||
for (i=0; i<8; i++)
|
||||
{
|
||||
nr_diff = nr | i << 5;
|
||||
printf("| %02x |%08x|",i << 5, nr_diff);
|
||||
printf(" %01x | %01x |",ks3x[i], ks3x[i]^5);
|
||||
for (pos=0; pos<7; pos++) printf("%01x,", par[i][pos]);
|
||||
printf("%01x|\n", par[i][7]);
|
||||
}
|
||||
|
||||
if (par_info==0)
|
||||
PrintAndLog("parity is all zero,try special attack!just wait for few more seconds...");
|
||||
|
||||
state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
|
||||
state_s = (int64_t*)state;
|
||||
|
||||
//char filename[50] ;
|
||||
//sprintf(filename, "nt_%08x_%d.txt", nt, nr);
|
||||
//printf("name %s\n", filename);
|
||||
//FILE* fp = fopen(filename,"w");
|
||||
for (i = 0; (state) && ((state + i)->odd != -1); i++)
|
||||
{
|
||||
lfsr_rollback_word(state+i, uid^nt, 0);
|
||||
crypto1_get_lfsr(state + i, &key_recovered);
|
||||
*(state_s + i) = key_recovered;
|
||||
//fprintf(fp, "%012llx\n",key_recovered);
|
||||
}
|
||||
//fclose(fp);
|
||||
|
||||
if(!state)
|
||||
return 1;
|
||||
|
||||
qsort(state_s, i, sizeof(*state_s), compar_state);
|
||||
*(state_s + i) = -1;
|
||||
|
||||
//Create the intersection:
|
||||
if (par_info == 0 )
|
||||
if ( last_keylist != NULL)
|
||||
{
|
||||
int64_t *p1, *p2, *p3;
|
||||
p1 = p3 = last_keylist;
|
||||
p2 = state_s;
|
||||
while ( *p1 != -1 && *p2 != -1 ) {
|
||||
if (compar_state(p1, p2) == 0) {
|
||||
printf("p1:%"llx" p2:%"llx" p3:%"llx" key:%012"llx"\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);
|
||||
*p3++ = *p1++;
|
||||
p2++;
|
||||
}
|
||||
else {
|
||||
while (compar_state(p1, p2) == -1) ++p1;
|
||||
while (compar_state(p1, p2) == 1) ++p2;
|
||||
}
|
||||
}
|
||||
key_count = p3 - last_keylist;;
|
||||
}
|
||||
else
|
||||
key_count = 0;
|
||||
else
|
||||
{
|
||||
last_keylist = state_s;
|
||||
key_count = i;
|
||||
}
|
||||
|
||||
printf("key_count:%d\n", key_count);
|
||||
|
||||
// The list may still contain several key candidates. Test each of them with mfCheckKeys
|
||||
for (i = 0; i < key_count; i++) {
|
||||
uint8_t keyBlock[6];
|
||||
uint64_t key64;
|
||||
key64 = *(last_keylist + i);
|
||||
num_to_bytes(key64, 6, keyBlock);
|
||||
key64 = 0;
|
||||
if (!mfCheckKeys(blockNo, keyType, false, 1, keyBlock, &key64)) {
|
||||
*key = key64;
|
||||
free(last_keylist);
|
||||
last_keylist = NULL;
|
||||
if (par_info ==0)
|
||||
free(state);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
free(last_keylist);
|
||||
last_keylist = state_s;
|
||||
|
||||
*key = last_keylist;
|
||||
return key_count+1;
|
||||
}
|
||||
|
||||
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate)
|
||||
{
|
||||
uint16_t i;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ typedef struct {
|
|||
|
||||
extern char logHexFileName[FILE_PATH_SIZE];
|
||||
|
||||
int magic_nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key, uint32_t blockNo, uint8_t keyType);
|
||||
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
|
||||
int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,36 +15,15 @@
|
|||
#define llx PRIx64
|
||||
|
||||
#include "nonce2key.h"
|
||||
#include "mifarehost.h"
|
||||
#include "ui.h"
|
||||
|
||||
int compar_state(const void * a, const void * b) {
|
||||
// didn't work: (the result is truncated to 32 bits)
|
||||
//return (*(int64_t*)b - *(int64_t*)a);
|
||||
|
||||
// better:
|
||||
if (*(int64_t*)b == *(int64_t*)a) return 0;
|
||||
else if (*(int64_t*)b > *(int64_t*)a) return 1;
|
||||
else return -1;
|
||||
}
|
||||
|
||||
int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
|
||||
struct Crypto1State *state;
|
||||
uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2;
|
||||
byte_t bt, ks3x[8], par[8][8];
|
||||
struct Crypto1State *state, *state_s;
|
||||
uint32_t pos, rr, nr_diff;//, ks1, ks2;
|
||||
byte_t bt, i, ks3x[8], par[8][8];
|
||||
uint64_t key_recovered;
|
||||
int64_t *state_s;
|
||||
static uint32_t last_uid;
|
||||
static int64_t *last_keylist;
|
||||
rr = 0;
|
||||
|
||||
if (last_uid != uid && last_keylist != NULL)
|
||||
{
|
||||
free(last_keylist);
|
||||
last_keylist = NULL;
|
||||
}
|
||||
last_uid = uid;
|
||||
|
||||
// Reset the last three significant bits of the reader nonce
|
||||
nr &= 0xffffff1f;
|
||||
|
||||
|
|
@ -71,81 +50,20 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
|
|||
printf("%01x|\n", par[i][7]);
|
||||
}
|
||||
|
||||
if (par_info==0)
|
||||
PrintAndLog("parity is all zero,try special attack!just wait for few more seconds...");
|
||||
state = lfsr_common_prefix(nr, rr, ks3x, par, 0);
|
||||
state_s = 0;
|
||||
for (i = 0; (state) && ((state + i)->odd != -1 || (state + i)->even != ) && (i < 10); i++)
|
||||
{
|
||||
printf("%08x|%08x\n",(state+i)->odd, (state+i)->even);
|
||||
state_s = state + i;
|
||||
}
|
||||
if (!state_s) return 1;
|
||||
|
||||
lfsr_rollback_word(state_s, uid^nt, 0);
|
||||
crypto1_get_lfsr(state_s, &key_recovered);
|
||||
if (!state) free(state);
|
||||
|
||||
*key = key_recovered;
|
||||
|
||||
state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
|
||||
state_s = (int64_t*)state;
|
||||
|
||||
//char filename[50] ;
|
||||
//sprintf(filename, "nt_%08x_%d.txt", nt, nr);
|
||||
//printf("name %s\n", filename);
|
||||
//FILE* fp = fopen(filename,"w");
|
||||
for (i = 0; (state) && ((state + i)->odd != -1); i++)
|
||||
{
|
||||
lfsr_rollback_word(state+i, uid^nt, 0);
|
||||
crypto1_get_lfsr(state + i, &key_recovered);
|
||||
*(state_s + i) = key_recovered;
|
||||
//fprintf(fp, "%012llx\n",key_recovered);
|
||||
}
|
||||
//fclose(fp);
|
||||
|
||||
if(!state)
|
||||
return 1;
|
||||
|
||||
qsort(state_s, i, sizeof(*state_s), compar_state);
|
||||
*(state_s + i) = -1;
|
||||
|
||||
//Create the intersection:
|
||||
if (par_info == 0 )
|
||||
if ( last_keylist != NULL)
|
||||
{
|
||||
int64_t *p1, *p2, *p3;
|
||||
p1 = p3 = last_keylist;
|
||||
p2 = state_s;
|
||||
while ( *p1 != -1 && *p2 != -1 ) {
|
||||
if (compar_state(p1, p2) == 0) {
|
||||
printf("p1:%"llx" p2:%"llx" p3:%"llx" key:%012"llx"\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);
|
||||
*p3++ = *p1++;
|
||||
p2++;
|
||||
}
|
||||
else {
|
||||
while (compar_state(p1, p2) == -1) ++p1;
|
||||
while (compar_state(p1, p2) == 1) ++p2;
|
||||
}
|
||||
}
|
||||
key_count = p3 - last_keylist;;
|
||||
}
|
||||
else
|
||||
key_count = 0;
|
||||
else
|
||||
{
|
||||
last_keylist = state_s;
|
||||
key_count = i;
|
||||
}
|
||||
|
||||
printf("key_count:%d\n", key_count);
|
||||
|
||||
// The list may still contain several key candidates. Test each of them with mfCheckKeys
|
||||
for (i = 0; i < key_count; i++) {
|
||||
uint8_t keyBlock[6];
|
||||
uint64_t key64;
|
||||
key64 = *(last_keylist + i);
|
||||
num_to_bytes(key64, 6, keyBlock);
|
||||
key64 = 0;
|
||||
if (!mfCheckKeys(0, 0, false, 1, keyBlock, &key64)) {
|
||||
*key = key64;
|
||||
free(last_keylist);
|
||||
last_keylist = NULL;
|
||||
if (par_info ==0)
|
||||
free(state);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
free(last_keylist);
|
||||
last_keylist = state_s;
|
||||
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue