X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7669409547dcf1148a9651a7a911076a103a6691..0ca9bc0e9929ba2f86af29b216b863971056e566:/client/nonce2key/nonce2key.c?ds=sidebyside diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c index 5647c424..5378c046 100644 --- a/client/nonce2key/nonce2key.c +++ b/client/nonce2key/nonce2key.c @@ -10,13 +10,14 @@ // MIFARE Darkside hack //----------------------------------------------------------------------------- -#define __STDC_FORMAT_MACROS #include -#define llx PRIx64 +#include #include "nonce2key.h" #include "mifarehost.h" #include "ui.h" +#include "util.h" +#include "crapto1/crapto1.h" int compar_state(const void * a, const void * b) { // didn't work: (the result is truncated to 32 bits) @@ -31,7 +32,7 @@ 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) { struct Crypto1State *state; uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2; - byte_t bt, ks3x[8], par[8][8]; + uint8_t bt, ks3x[8], par[8][8]; uint64_t key_recovered; int64_t *state_s; static uint32_t last_uid; @@ -48,7 +49,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("\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" PRIx64") ks(%016" PRIx64") nr(%08" PRIx32")\n\n",uid,nt,par_info,ks_info,nr); for (pos=0; pos<8; pos++) { @@ -71,22 +72,22 @@ 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..."); + if (par_info == 0) + PrintAndLog("Parity is all zero, trying special attack! Just wait for few more seconds..."); - state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0); + state = lfsr_common_prefix(nr, rr, ks3x, par); 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++) + for (i = 0; (state) && *(state_s + i); 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); + //fprintf(fp, "%012" PRIx64 "\n",key_recovered); } //fclose(fp); @@ -97,15 +98,14 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_ *(state_s + i) = -1; //Create the intersection: - if (par_info == 0 ) - if ( last_keylist != NULL) - { + 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); + printf("p1:%" PRIx64" p2:%" PRIx64 " p3:%" PRIx64" key:%012" PRIx64 "\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1); *p3++ = *p1++; p2++; } @@ -114,12 +114,11 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_ while (compar_state(p1, p2) == 1) ++p2; } } - key_count = p3 - last_keylist;; - } - else + key_count = p3 - last_keylist; + } else { key_count = 0; - else - { + } + } else { last_keylist = state_s; key_count = i; } @@ -137,7 +136,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_ *key = key64; free(last_keylist); last_keylist = NULL; - if (par_info ==0) + if (par_info == 0) free(state); return 0; } @@ -162,7 +161,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) { uint32_t nr1_enc = data.nr2; // second encrypted reader challenge uint32_t ar1_enc = data.ar2; // second encrypted reader response clock_t t1 = clock(); - bool isSuccess = FALSE; + bool isSuccess = false; uint8_t counter=0; s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0); @@ -175,7 +174,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) { crypto1_word(t, uid ^ nt, 0); crypto1_word(t, nr1_enc, 1); if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) { - //PrintAndLog("Found Key: [%012"llx"]",key); + //PrintAndLog("Found Key: [%012" PRIx64 "]",key); outkey = key; counter++; if (counter==20) break; @@ -209,7 +208,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) { uint32_t nt1 = data.nonce2; // second tag challenge (nonce) uint32_t nr1_enc = data.nr2; // second encrypted reader challenge uint32_t ar1_enc = data.ar2; // second encrypted reader response - bool isSuccess = FALSE; + bool isSuccess = false; int counter = 0; //PrintAndLog("Enter mfkey32_moebius"); @@ -226,7 +225,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))) { - //PrintAndLog("Found Key: [%012"llx"]",key); + //PrintAndLog("Found Key: [%012" PRIx64 "]",key); outkey=key; ++counter; if (counter==20) @@ -277,7 +276,7 @@ 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); + PrintAndLog("Found Key: [%012" PRIx64 "]", key); crypto1_destroy(revstate); *outputkey = key;