Merge pull request #49 from micolous/less-verbose-mfsim

[proxmark3-svn] / client / nonce2key / nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index bc8958265a83db79331717ceb14c7cad3b7b79ac..aeaecbe6759902fc97d8bdfa0185014784ae8d6c 100644 (file)
--- 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;
@@ -170,7 +170,18 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
        bool isSuccess = FALSE;
        uint8_t counter = 0;
 
+       printf("Recovering key for:\n");
+       printf("    uid: %08x\n",uid);
+       printf("     nt: %08x\n",nt);
+       printf(" {nr_0}: %08x\n",nr0_enc);
+       printf(" {ar_0}: %08x\n",ar0_enc);
+       printf(" {nr_1}: %08x\n",nr1_enc);
+       printf(" {ar_1}: %08x\n",ar1_enc);
+
+       printf("\nLFSR succesors of the tag challenge:\n");
        uint32_t p64 = prng_successor(nt, 64);
+       printf("  nt': %08x\n", p64);
+       printf(" nt'': %08x\n", prng_successor(p64, 32));
        
        s = lfsr_recovery32(ar0_enc ^ p64, 0);
   
@@ -197,7 +208,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
        return isSuccess;
 }
 
-bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey, bool showMaths) {
        struct Crypto1State *s, *t;
        uint64_t outkey  = 0;
        uint64_t key     = 0;                        // recovered key
@@ -212,12 +223,29 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
        bool isSuccess = FALSE;
        int counter = 0;
        
+       if (showMaths) {
+               printf("Recovering key for:\n");
+               printf("    uid: %08x\n", uid);
+               printf("   nt_0: %08x\n", nt0);
+               printf(" {nr_0}: %08x\n", nr0_enc);
+               printf(" {ar_0}: %08x\n", ar0_enc);
+               printf("   nt_1: %08x\n", nt1);
+               printf(" {nr_1}: %08x\n", nr1_enc);
+               printf(" {ar_1}: %08x\n", ar1_enc);
+       }
+
        //PrintAndLog("Enter mfkey32_moebius");
        clock_t t1 = clock();
 
        uint32_t p640 = prng_successor(nt0, 64);
        uint32_t p641 = prng_successor(nt1, 64);
        
+       if (showMaths) {
+               printf("\nLFSR succesors of the tag challenge:\n");
+               printf("  nt': %08x\n", p640);
+               printf(" nt'': %08x\n", prng_successor(p640, 32));
+       }
+       
        s = lfsr_recovery32(ar0_enc ^ p640, 0);
   
        for(t = s; t->odd | t->even; ++t) {