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

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 87f66fd6bf11de50d25862841f1bfd112759e6c7..bc8958265a83db79331717ceb14c7cad3b7b79ac 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -10,9 +10,6 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 #include "nonce2key.h"
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 #include "nonce2key.h"

-#include "mifarehost.h"
-#include "ui.h"
-#include "proxmark3.h"

 
 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;
 
 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;


@@ -48,7 +45,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
        clock_t t1 = clock();
 
        state = lfsr_common_prefix(nr, rr, ks3x, par);
        clock_t t1 = clock();
 
        state = lfsr_common_prefix(nr, rr, ks3x, par);

-       lfsr_rollback_word(state, uid^nt, 0);
+       lfsr_rollback_word(state, uid ^ nt, 0);

        crypto1_get_lfsr(state, key);
        crypto1_destroy(state);
 
        crypto1_get_lfsr(state, key);
        crypto1_destroy(state);
 


@@ -57,22 +54,32 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
        return 0;
 }
 
        return 0;
 }
 

-// call when PAR == 0,  special attack?
-int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint64_t * key) {
+// call when PAR == 0,  special attack?  It seems to need two calls.  with same uid, block, keytype
+int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint64_t * key) {
+

        struct Crypto1State *state;
        uint32_t i, pos, key_count;
        byte_t ks3x[8];
 
        uint64_t key_recovered;
        struct Crypto1State *state;
        uint32_t i, pos, key_count;
        byte_t ks3x[8];
 
        uint64_t key_recovered;

+

        int64_t *state_s;
        int64_t *state_s;

+       static uint8_t last_blockno;
+       static uint8_t last_keytype;

        static uint32_t last_uid;
        static int64_t *last_keylist;
        static uint32_t last_uid;
        static int64_t *last_keylist;

-
-       if (last_uid != uid && last_keylist != NULL) {
+  
+       if (last_uid != uid &&
+               last_blockno != blockno &&
+               last_keytype != keytype &&
+               last_keylist != NULL)
+       {

                free(last_keylist);
                last_keylist = NULL;
        }
        last_uid = uid;
                free(last_keylist);
                last_keylist = NULL;
        }
        last_uid = uid;

+       last_blockno = blockno;
+       last_keytype = keytype;

 
        // Reset the last three significant bits of the reader nonce
        nr &= 0xffffff1f;
 
        // Reset the last three significant bits of the reader nonce
        nr &= 0xffffff1f;


@@ -83,24 +90,16 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
                ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
        }
   
                ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
        }
   

-       PrintAndLog("parity is all zero,try special attack! just wait for few more seconds");
-
-       clock_t t1 = clock();
+       PrintAndLog("parity is all zero, try special attack. Just wait for few more seconds...");

        
        state = lfsr_common_prefix_ex(nr, ks3x);
        state_s = (int64_t*)state;
        
        
        state = lfsr_common_prefix_ex(nr, ks3x);
        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 + i)->odd != -1); i++) {

-               lfsr_rollback_word(state+i, uid^nt, 0);
+               lfsr_rollback_word(state + i, uid ^ nt, 0);

                crypto1_get_lfsr(state + i, &key_recovered);
                *(state_s + i) = key_recovered;
                crypto1_get_lfsr(state + i, &key_recovered);
                *(state_s + i) = key_recovered;

-               //fprintf(fp, "%012llx\n",key_recovered);

        }
        }

-       //fclose(fp);

        
        if(!state)
                return 1;
        
        if(!state)
                return 1;


@@ -110,9 +109,11 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
        
        //Create the intersection:
        if ( last_keylist != NULL) {
        
        //Create the intersection:
        if ( last_keylist != NULL) {

+

                int64_t *p1, *p2, *p3;
                p1 = p3 = last_keylist; 
                p2 = state_s;
                int64_t *p1, *p2, *p3;
                p1 = p3 = last_keylist; 
                p2 = state_s;

+               

                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);
                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);


@@ -124,54 +125,54 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
                                while (compar_int(p1, p2) == 1) ++p2;
                        }
                }
                                while (compar_int(p1, p2) == 1) ++p2;
                        }
                }

-               key_count = p3 - last_keylist;;
+               key_count = p3 - last_keylist;
+               PrintAndLog("one A");

        } else {
                key_count = 0;
        } else {
                key_count = 0;

+               PrintAndLog("one B");

        }
 
        printf("key_count:%d\n", key_count);
        
        // The list may still contain several key candidates. Test each of them with mfCheckKeys
        }
 
        printf("key_count:%d\n", key_count);
        
        // The list may still contain several key candidates. Test each of them with mfCheckKeys

-       uint8_t keyBlock[6];
+       uint8_t keyBlock[6] = {0,0,0,0,0,0};

        uint64_t key64;
        for (i = 0; i < key_count; i++) {
                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);
                key64 = 0;
        uint64_t key64;
        for (i = 0; i < key_count; i++) {
                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);
                key64 = 0;

-               if (!mfCheckKeys(0, 0, TRUE, 1, keyBlock, &key64)) {  //block 0,A,
+               if (!mfCheckKeys(blockno, keytype, false, 1, keyBlock, &key64)) {

                        *key = key64;
                        free(last_keylist);
                        last_keylist = NULL;
                        free(state);
                        return 0;
                }
                        *key = key64;
                        free(last_keylist);
                        last_keylist = NULL;
                        free(state);
                        return 0;
                }

-       }
-
-       t1 = clock() - t1;
-       if ( t1 > 0 ) PrintAndLog("Time in nonce2key_special: %.0f ticks \n", (float)t1);
-
+       }       
+       

        free(last_keylist);
        last_keylist = state_s;
        return 1;
 }
 
        free(last_keylist);
        last_keylist = state_s;
        return 1;
 }
 

-int tryMfk32(uint8_t *data, uint64_t *outputkey ){
+// 32 bit recover key from 2 nonces
+bool tryMfk32(nonces_t data, uint64_t *outputkey) {

        struct Crypto1State *s,*t;
        struct Crypto1State *s,*t;

-       uint64_t key;                                            // recovered key
-       uint32_t uid     = le32toh(data);
-       uint32_t nt      = le32toh(data+4);  // tag challenge
-       uint32_t nr0_enc = le32toh(data+8);  // first encrypted reader challenge
-       uint32_t ar0_enc = le32toh(data+12); // first encrypted reader response
-       //+16 uid2
-       //+20 nt2
-       uint32_t nr1_enc = le32toh(data+24); // second encrypted reader challenge
-       uint32_t ar1_enc = le32toh(data+28); // second encrypted reader response        
+       uint64_t outkey = 0;
+       uint64_t key=0;     // recovered key
+       uint32_t uid     = data.cuid;
+       uint32_t nt      = data.nonce;  // first tag challenge (nonce)
+       uint32_t nr0_enc = data.nr;  // first encrypted reader challenge
+       uint32_t ar0_enc = data.ar;  // first encrypted reader response
+       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;

-       int counter = 0;
+       uint8_t counter = 0;

 
 

-       PrintAndLog("Enter mfkey32");
-       clock_t t1 = clock();
-       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);
   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);


@@ -180,39 +181,44 @@ int tryMfk32(uint8_t *data, uint64_t *outputkey ){
                crypto1_get_lfsr(t, &key);
                crypto1_word(t, uid ^ nt, 0);
                crypto1_word(t, nr1_enc, 1);
                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))) {
-                       PrintAndLog("Found Key: [%012"llx"]", key);
-                       isSuccess = TRUE;
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
+                       //PrintAndLog("Found Key: [%012"llx"]", key);
+                       outkey = key;

                        ++counter;
                        ++counter;

-                       if (counter==100)
-                               break;
+                       if (counter==20) break;

                }
        }
                }
        }

+       isSuccess = (counter > 0);

        t1 = clock() - t1;
        t1 = clock() - t1;

-       if ( t1 > 0 ) PrintAndLog("Time in mf32key: %.0f ticks \n", (float)t1);
-       *outputkey = ( isSuccess ) ? key : 0;
+       if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks  - possible keys %d\n", (float)t1, counter);
+
+       *outputkey = ( isSuccess ) ? outkey : 0;        

        crypto1_destroy(s);
        return isSuccess;
 }
 
        crypto1_destroy(s);
        return isSuccess;
 }
 

-int tryMfk32_moebius(uint8_t *data, uint64_t *outputkey ){
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {

        struct Crypto1State *s, *t;
        struct Crypto1State *s, *t;

+       uint64_t outkey  = 0;

        uint64_t key     = 0;                        // recovered key
        uint64_t key     = 0;                        // recovered key

-       uint32_t uid     = le32toh(data);
-       uint32_t nt0     = le32toh(data+4);  // first tag challenge (nonce)
-       uint32_t nr0_enc = le32toh(data+8);  // first encrypted reader challenge
-       uint32_t ar0_enc = le32toh(data+12); // first encrypted reader response
+       uint32_t uid     = data.cuid;
+       uint32_t nt0     = data.nonce;  // first tag challenge (nonce)
+       uint32_t nr0_enc = data.nr;  // first encrypted reader challenge
+       uint32_t ar0_enc = data.ar; // first encrypted reader response

        //uint32_t uid1    = le32toh(data+16);
        //uint32_t uid1    = le32toh(data+16);

-       uint32_t nt1     = le32toh(data+20); // second tag challenge (nonce)
-       uint32_t nr1_enc = le32toh(data+24); // second encrypted reader challenge
-       uint32_t ar1_enc = le32toh(data+28); // second encrypted reader response        
+       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;
        int counter = 0;
        
        bool isSuccess = FALSE;
        int counter = 0;
        

-       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) {
                lfsr_rollback_word(t, 0, 0);
   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);


@@ -222,17 +228,18 @@ int tryMfk32_moebius(uint8_t *data, uint64_t *outputkey ){
                
                crypto1_word(t, uid ^ nt1, 0);
                crypto1_word(t, nr1_enc, 1);
                
                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);
-                       isSuccess = TRUE;
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p641)) {
+                       //PrintAndLog("Found Key: [%012"llx"]",key);
+                       outkey=key;

                        ++counter;
                        ++counter;

-                       if (counter==20)
-                               break;
+                       if (counter==20) break;

                }
        }
                }
        }

+    isSuccess  = (counter > 0);

        t1 = clock() - t1;
        t1 = clock() - t1;

-       if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks \n", (float)t1);
-       *outputkey = ( isSuccess ) ? key : 0;
+       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;
 }
        crypto1_destroy(s);
        return isSuccess;
 }


@@ -247,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){
 }
 
 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");
        struct Crypto1State *revstate;
        
        PrintAndLog("Enter mfkey64");


@@ -264,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);
        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"llx"]", key);

-       crypto1_destroy(revstate);
-       *outputkey = key;
-       

        t1 = clock() - t1;
        if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1);
        t1 = clock() - t1;
        if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1);

+
+       *outputkey = key;
+       crypto1_destroy(revstate);

        return 0;
 }
        return 0;
 }