X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/59e933fc3f9c4283436b3b317b38c77db0e5d0a7..ad5bc8cc8c0a6573d6b2c7bc58bf94f7ab66ad4c:/client/nonce2key/nonce2key.c?ds=sidebyside diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c index 3a902ac5..048d2adf 100644 --- a/client/nonce2key/nonce2key.c +++ b/client/nonce2key/nonce2key.c @@ -19,7 +19,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_ // Reset the last three significant bits of the reader nonce nr &= 0xffffff1f; - PrintAndLog("uid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n", uid, nt, par_info, ks_info, nr); + PrintAndLog("uid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08x)\n", uid, nt, par_info, ks_info, nr); for ( pos = 0; pos < 8; pos++ ) { ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f; @@ -84,7 +84,7 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui // Reset the last three significant bits of the reader nonce nr &= 0xffffff1f; - PrintAndLog("uid(%08x) nt(%08x) ks(%016"llx") nr(%08"llx")\n", uid, nt, ks_info, nr); + PrintAndLog("uid(%08x) nt(%08x) ks(%016"llx") nr(%08x)\n", uid, nt, ks_info, nr); for (pos=0; pos<8; pos++) { ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f; @@ -94,7 +94,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui state = lfsr_common_prefix_ex(nr, ks3x); state_s = (int64_t*)state; - PrintAndLog("Prefix"); for (i = 0; (state) && ((state + i)->odd != -1); i++) { lfsr_rollback_word(state + i, uid ^ nt, 0); @@ -102,7 +101,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui *(state_s + i) = key_recovered; } - PrintAndLog("zero"); if(!state) return 1; @@ -116,7 +114,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui p1 = p3 = last_keylist; p2 = state_s; - PrintAndLog("one"); while ( *p1 != -1 && *p2 != -1 ) { if (compar_int(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); @@ -128,9 +125,11 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui while (compar_int(p1, p2) == 1) ++p2; } } - key_count = p3 - last_keylist;; + key_count = p3 - last_keylist; + PrintAndLog("one A"); } else { key_count = 0; + PrintAndLog("one B"); } printf("key_count:%d\n", key_count); @@ -138,7 +137,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui // The list may still contain several key candidates. Test each of them with mfCheckKeys uint8_t keyBlock[6] = {0,0,0,0,0,0}; uint64_t key64; - PrintAndLog("two"); for (i = 0; i < key_count; i++) { key64 = *(last_keylist + i); num_to_bytes(key64, 6, keyBlock); @@ -172,8 +170,9 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) { bool isSuccess = FALSE; uint8_t counter = 0; - - s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0); + uint32_t p64 = prng_successor(nt, 64); + + s = lfsr_recovery32(ar0_enc ^ p64, 0); for(t = s; t->odd | t->even; ++t) { lfsr_rollback_word(t, 0, 0); @@ -182,7 +181,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) { crypto1_get_lfsr(t, &key); crypto1_word(t, uid ^ nt, 0); 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); outkey = key; ++counter; @@ -192,7 +191,8 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) { isSuccess = (counter > 0); t1 = clock() - t1; 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); return isSuccess; } @@ -215,7 +215,10 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) { //PrintAndLog("Enter mfkey32_moebius"); 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) { lfsr_rollback_word(t, 0, 0); @@ -225,7 +228,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) { crypto1_word(t, uid ^ nt1, 0); 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); outkey=key; ++counter; @@ -235,6 +238,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) { isSuccess = (counter > 0); t1 = clock() - t1; if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks - possible keys %d\n", (float)t1, counter); + *outputkey = ( isSuccess ) ? outkey : 0; crypto1_destroy(s); return isSuccess; @@ -250,9 +254,9 @@ int tryMfk64_ex(uint8_t *data, uint64_t *outputkey){ } int tryMfk64(uint32_t uid, uint32_t nt, uint32_t nr_enc, uint32_t ar_enc, uint32_t at_enc, uint64_t *outputkey){ - uint64_t key = 0; // recovered key - uint32_t ks2; // keystream used to encrypt reader response - uint32_t ks3; // keystream used to encrypt tag response + uint64_t key = 0; // recovered key + uint32_t ks2; // keystream used to encrypt reader response + uint32_t ks3; // keystream used to encrypt tag response struct Crypto1State *revstate; PrintAndLog("Enter mfkey64"); @@ -267,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, uid ^ nt, 0); crypto1_get_lfsr(revstate, &key); + PrintAndLog("Found Key: [%012"llx"]", key); - crypto1_destroy(revstate); - *outputkey = key; - t1 = clock() - t1; if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1); + + *outputkey = key; + crypto1_destroy(revstate); return 0; }