github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: Changed the number of times the call to prng_successor is called.

Browse source
This commit is contained in:
iceman1001 2016-08-24 12:32:05 +02:00
commit 02d5a58388
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/nonce2key/nonce2key.c
View file

@ -170,8 +170,9 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
bool isSuccess = FALSE; bool isSuccess = FALSE;
uint8_t counter = 0; uint8_t counter = 0;
uint32_t p64 = prng_successor(nt, 64);
s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0); s = lfsr_recovery32(ar0_enc ^ p64, 0);
for(t = s; t->odd | t->even; ++t) { for(t = s; t->odd | t->even; ++t) {
lfsr_rollback_word(t, 0, 0); lfsr_rollback_word(t, 0, 0);
@ -180,7 +181,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
crypto1_get_lfsr(t, &key); crypto1_get_lfsr(t, &key);
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) ^ p64)) {
//PrintAndLog("Found Key: [%012"llx"]", key); //PrintAndLog("Found Key: [%012"llx"]", key);
outkey = key; outkey = key;
++counter; ++counter;
@ -190,6 +191,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
isSuccess = (counter > 0); isSuccess = (counter > 0);
t1 = clock() - t1; t1 = clock() - t1;
if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks - possible keys %d\n", (float)t1, counter); if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks - possible keys %d\n", (float)t1, counter);
*outputkey = ( isSuccess ) ? outkey : 0; *outputkey = ( isSuccess ) ? outkey : 0;
crypto1_destroy(s); crypto1_destroy(s);
return isSuccess; return isSuccess;
@ -213,7 +215,10 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
//PrintAndLog("Enter mfkey32_moebius"); //PrintAndLog("Enter mfkey32_moebius");
clock_t t1 = clock(); clock_t t1 = clock();
s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0); uint32_t p640 = prng_successor(nt0, 64);
uint32_t p641 = prng_successor(nt1, 64);
s = lfsr_recovery32(ar0_enc ^ p640, 0);
for(t = s; t->odd | t->even; ++t) { for(t = s; t->odd | t->even; ++t) {
lfsr_rollback_word(t, 0, 0); lfsr_rollback_word(t, 0, 0);
@ -223,7 +228,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
crypto1_word(t, uid ^ nt1, 0); crypto1_word(t, uid ^ nt1, 0);
crypto1_word(t, nr1_enc, 1); crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) { if (ar1_enc == (crypto1_word(t, 0, 0) ^ p641)) {
//PrintAndLog("Found Key: [%012"llx"]",key); //PrintAndLog("Found Key: [%012"llx"]",key);
outkey=key; outkey=key;
++counter; ++counter;
@ -233,6 +238,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
isSuccess = (counter > 0); isSuccess = (counter > 0);
t1 = clock() - t1; t1 = clock() - t1;
if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks - possible keys %d\n", (float)t1, counter); if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks - possible keys %d\n", (float)t1, counter);
*outputkey = ( isSuccess ) ? outkey : 0; *outputkey = ( isSuccess ) ? outkey : 0;
crypto1_destroy(s); crypto1_destroy(s);
return isSuccess; return isSuccess;
@ -265,11 +271,12 @@ int tryMfk64(uint32_t uid, uint32_t nt, uint32_t nr_enc, uint32_t ar_enc, uint32
lfsr_rollback_word(revstate, nr_enc, 1); lfsr_rollback_word(revstate, nr_enc, 1);
lfsr_rollback_word(revstate, uid ^ nt, 0); lfsr_rollback_word(revstate, uid ^ nt, 0);
crypto1_get_lfsr(revstate, &key); crypto1_get_lfsr(revstate, &key);
PrintAndLog("Found Key: [%012"llx"]", key);
crypto1_destroy(revstate);
*outputkey = key;
PrintAndLog("Found Key: [%012"llx"]", key);
t1 = clock() - t1; t1 = clock() - t1;
if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1); if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1);
*outputkey = key;
crypto1_destroy(revstate);
return 0; return 0;
} }