github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: Tested to unfold some loops inside the crypto1 implementation to see if it generates some speed ups. Feels ok.

Browse source
This commit is contained in:
iceman1001 2016-01-13 21:51:06 +01:00
commit 738eeccd9d
3 changed files with 84 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
client/nonce2key/crapto1.c
View file

@ -405,18 +405,66 @@ void lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
*/ */
void lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) void lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
{ {
int i; /* int i;
for (i = 7; i >= 0; --i) for (i = 7; i >= 0; --i)
lfsr_rollback_bit(s, BEBIT(in, i), fb); lfsr_rollback_bit(s, BEBIT(in, i), fb);
*/
// unfold loop 20160112
lfsr_rollback_bit(s, BEBIT(in, 7), fb);
lfsr_rollback_bit(s, BEBIT(in, 6), fb);
lfsr_rollback_bit(s, BEBIT(in, 5), fb);
lfsr_rollback_bit(s, BEBIT(in, 4), fb);
lfsr_rollback_bit(s, BEBIT(in, 3), fb);
lfsr_rollback_bit(s, BEBIT(in, 2), fb);
lfsr_rollback_bit(s, BEBIT(in, 1), fb);
lfsr_rollback_bit(s, BEBIT(in, 0), fb);
} }
/** lfsr_rollback_word /** lfsr_rollback_word
* Rollback the shift register in order to get previous states * Rollback the shift register in order to get previous states
*/ */
void lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) void lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
{ {
/*
int i; int i;
for (i = 31; i >= 0; --i) for (i = 31; i >= 0; --i)
lfsr_rollback_bit(s, BEBIT(in, i), fb); lfsr_rollback_bit(s, BEBIT(in, i), fb);
*/
// unfold loop 20160112
lfsr_rollback_bit(s, BEBIT(in, 31), fb);
lfsr_rollback_bit(s, BEBIT(in, 30), fb);
lfsr_rollback_bit(s, BEBIT(in, 29), fb);
lfsr_rollback_bit(s, BEBIT(in, 28), fb);
lfsr_rollback_bit(s, BEBIT(in, 27), fb);
lfsr_rollback_bit(s, BEBIT(in, 26), fb);
lfsr_rollback_bit(s, BEBIT(in, 25), fb);
lfsr_rollback_bit(s, BEBIT(in, 24), fb);
lfsr_rollback_bit(s, BEBIT(in, 23), fb);
lfsr_rollback_bit(s, BEBIT(in, 22), fb);
lfsr_rollback_bit(s, BEBIT(in, 21), fb);
lfsr_rollback_bit(s, BEBIT(in, 20), fb);
lfsr_rollback_bit(s, BEBIT(in, 19), fb);
lfsr_rollback_bit(s, BEBIT(in, 18), fb);
lfsr_rollback_bit(s, BEBIT(in, 17), fb);
lfsr_rollback_bit(s, BEBIT(in, 16), fb);
lfsr_rollback_bit(s, BEBIT(in, 15), fb);
lfsr_rollback_bit(s, BEBIT(in, 14), fb);
lfsr_rollback_bit(s, BEBIT(in, 13), fb);
lfsr_rollback_bit(s, BEBIT(in, 12), fb);
lfsr_rollback_bit(s, BEBIT(in, 11), fb);
lfsr_rollback_bit(s, BEBIT(in, 10), fb);
lfsr_rollback_bit(s, BEBIT(in, 9), fb);
lfsr_rollback_bit(s, BEBIT(in, 8), fb);
lfsr_rollback_bit(s, BEBIT(in, 7), fb);
lfsr_rollback_bit(s, BEBIT(in, 6), fb);
lfsr_rollback_bit(s, BEBIT(in, 5), fb);
lfsr_rollback_bit(s, BEBIT(in, 4), fb);
lfsr_rollback_bit(s, BEBIT(in, 3), fb);
lfsr_rollback_bit(s, BEBIT(in, 2), fb);
lfsr_rollback_bit(s, BEBIT(in, 1), fb);
lfsr_rollback_bit(s, BEBIT(in, 0), fb);
} }
/** nonce_distance /** nonce_distance

14
client/nonce2key/crypto1.c
View file

@ -38,6 +38,7 @@ void crypto1_destroy(struct Crypto1State *state)
{ {
free(state); free(state);
} }
void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr) void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
{ {
int i; int i;
@ -66,11 +67,22 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
} }
uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted) uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
{ {
/*
uint8_t i, ret = 0; uint8_t i, ret = 0;
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i; ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
*/
// unfold loop 20160112
uint8_t ret = 0;
ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
return ret; return ret;
} }
uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted) uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)

34
client/nonce2key/nonce2key.c
View file

@ -29,14 +29,15 @@ int compar_state(const void * a, const void * b) {
} }
int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) { 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; struct Crypto1State *state;
uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2; uint32_t i, pos, rr = 0, nr_diff, key_count;//, ks1, ks2;
byte_t bt, ks3x[8], par[8][8]; byte_t bt, ks3x[8], par[8][8];
uint64_t key_recovered; uint64_t key_recovered;
int64_t *state_s; int64_t *state_s;
static uint32_t last_uid; static uint32_t last_uid;
static int64_t *last_keylist; static int64_t *last_keylist;
rr = 0;
if (last_uid != uid && last_keylist != NULL) { if (last_uid != uid && last_keylist != NULL) {
free(last_keylist); free(last_keylist);
@ -49,21 +50,23 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
PrintAndLog("\nuid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n\n", uid, nt, par_info, ks_info, nr); 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++) { for ( pos = 0; pos < 8; pos++ ) {
ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f; ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
bt = (par_info >> (pos*8)) & 0xff; bt = (par_info >> (pos*8)) & 0xff;
for (i=0; i<8; i++) {
for ( i = 0; i < 8; i++) {
par[7-pos][i] = (bt >> i) & 0x01; par[7-pos][i] = (bt >> i) & 0x01;
} }
} }
printf("|diff|{nr} |ks3|ks3^5|parity |\n"); printf("|diff|{nr} |ks3|ks3^5|parity |\n");
printf("+----+--------+---+-----+---------------+\n"); printf("+----+--------+---+-----+---------------+\n");
for (i=0; i<8; i++) {
for ( i = 0; i < 8; i++) {
nr_diff = nr | i << 5; nr_diff = nr | i << 5;
printf("| %02x |%08x|", i << 5, nr_diff); printf("| %02x |%08x|", i << 5, nr_diff);
printf(" %01x | %01x |", ks3x[i], ks3x[i]^5); printf(" %01x | %01x |", ks3x[i], ks3x[i]^5);
for (pos=0; pos<7; pos++) for (pos = 0; pos < 7; pos++)
printf("%01x,", par[i][pos]); printf("%01x,", par[i][pos]);
printf("%01x|\n", par[i][7]); printf("%01x|\n", par[i][7]);
} }
@ -91,7 +94,10 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
if(!state) if(!state)
return 1; return 1;
// quicksort statelist
qsort(state_s, i, sizeof(*state_s), compar_state); qsort(state_s, i, sizeof(*state_s), compar_state);
// set last element marker
*(state_s + i) = -1; *(state_s + i) = -1;
//Create the intersection: //Create the intersection:
@ -134,6 +140,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
key64 = *(last_keylist + i); key64 = *(last_keylist + i);
num_to_bytes(key64, 6, keyBlock); num_to_bytes(key64, 6, keyBlock);
key64 = 0; key64 = 0;
// Call tag to verify if key is correct
res = mfCheckKeys(0, 0, false, 1, keyBlock, &key64); res = mfCheckKeys(0, 0, false, 1, keyBlock, &key64);
if (!res) { if (!res) {
*key = key64; *key = key64;
@ -150,6 +157,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
return 1; return 1;
} }
// *outputkey is not used...
int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){ int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
struct Crypto1State *s,*t; struct Crypto1State *s,*t;
@ -188,24 +196,25 @@ int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
crypto1_word(t, uid ^ nt, 0); crypto1_word(t, uid ^ nt, 0);
crypto1_word(t, nr1_enc, 1); crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) { if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
PrintAndLog("Found Key: [%012"llx"]",key); PrintAndLog("Found Key: [%012"llx"]", key);
isSuccess = TRUE; isSuccess = TRUE;
++counter; ++counter;
if (counter==20) if (counter==20)
break; break;
} }
} }
free(s); crypto1_destroy(t);
crypto1_destroy(s);
return isSuccess; return isSuccess;
} }
int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){ int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
struct Crypto1State *s,*t; struct Crypto1State *s, *t;
uint64_t key; // recovered key uint64_t key; // recovered key
uint32_t uid; // serial number uint32_t uid; // serial number
uint32_t nt0; // tag challenge first uint32_t nt0; // tag challenge first
uint32_t nt1; // tag challenge second uint32_t nt1; // tag challenge second
uint32_t nr0_enc; // first encrypted reader challenge uint32_t nr0_enc; // first encrypted reader challenge
uint32_t ar0_enc; // first encrypted reader response uint32_t ar0_enc; // first encrypted reader response
uint32_t nr1_enc; // second encrypted reader challenge uint32_t nr1_enc; // second encrypted reader challenge
@ -239,7 +248,8 @@ int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
break; break;
} }
} }
free(s); crypto1_destroy(t);
crypto1_destroy(s);
return isSuccess; return isSuccess;
} }