ADD: some clocking for 'hf mf mifare', 'hf mf nested', 'hf mf chk'

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 919c0a3eded18dfe4e75413fb23c76e5ff5e2b52..81f5ae1c762303a3abba5afb39ac4a3935ca1d9a 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -29,50 +29,51 @@ 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) {
 }
 
 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];
-  uint64_t key_recovered;
-  int64_t *state_s;
-  static uint32_t last_uid;
-  static int64_t *last_keylist;
-  rr = 0;
+
+       struct Crypto1State *state;
+       uint32_t i, pos, rr = 0, nr_diff, key_count;//, ks1, ks2;
+       byte_t bt, ks3x[8], par[8][8];
+       uint64_t key_recovered;
+       int64_t *state_s;
+
+       static uint32_t last_uid;
+       static int64_t *last_keylist;

   
   

-  if (last_uid != uid && last_keylist != NULL)
-  {
-       free(last_keylist);
-       last_keylist = NULL;
-  }
-  last_uid = uid;
+       if (last_uid != uid && last_keylist != NULL) {
+               free(last_keylist);
+               last_keylist = NULL;
+       }
+       last_uid = uid;

 
 

-  // Reset the last three significant bits of the reader nonce
-  nr &= 0xffffff1f;
+       // 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"llx") ks(%016"llx") nr(%08"llx")\n\n", uid, nt, par_info, ks_info, nr);

 
 

-  for (pos=0; pos<8; pos++)
-  {
-    ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
-    bt = (par_info >> (pos*8)) & 0xff;
-    for (i=0; i<8; i++)
-    {
-      par[7-pos][i] = (bt >> i) & 0x01;
-    }
-  }
+       for ( pos = 0; pos < 8; pos++ ) {
+               ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
+               bt = (par_info >> (pos*8)) & 0xff;

 
 

-  printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
-  printf("+----+--------+---+-----+---------------+\n");
-  for (i=0; i<8; i++)
-  {
-    nr_diff = nr | i << 5;
-    printf("| %02x |%08x|",i << 5, nr_diff);
-    printf(" %01x |  %01x  |",ks3x[i], ks3x[i]^5);
-    for (pos=0; pos<7; pos++) printf("%01x,", par[i][pos]);
-    printf("%01x|\n", par[i][7]);
-  }
-  
-       if (par_info==0)
-               PrintAndLog("parity is all zero,try special attack!just wait for few more seconds...");
+               for ( i = 0; i < 8; i++) {
+                       par[7-pos][i] = (bt >> i) & 0x01;
+               }
+       }
+
+       printf("|diff|{nr}    |ks3|ks3^5|parity         |\n");
+       printf("+----+--------+---+-----+---------------+\n");
+
+       for ( i = 0; i < 8; i++) {
+               nr_diff = nr | i << 5;
+               printf("| %02x |%08x|", i << 5, nr_diff);
+               printf(" %01x |  %01x  |", ks3x[i], ks3x[i]^5);
+               for (pos = 0; pos < 7; pos++) 
+                       printf("%01x,", par[i][pos]);
+               printf("%01x|\n", par[i][7]);
+       }
+       printf("+----+--------+---+-----+---------------+\n");
+
+       if ( par_info == 0 )
+               PrintAndLog("Parity is all zero, try special attack! Wait for few more seconds...");

   
        state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
        state_s = (int64_t*)state;
   
        state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
        state_s = (int64_t*)state;


@@ -93,63 +94,70 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
        if(!state)
                return 1;
        
        if(!state)
                return 1;
        

+       // quicksort statelist

        qsort(state_s, i, sizeof(*state_s), compar_state);
        qsort(state_s, i, sizeof(*state_s), compar_state);

+
+       // set last element marker 

        *(state_s + i) = -1;
        
        //Create the intersection:
        *(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) {
                        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:%"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);

                                        *p3++ = *p1++;
                                        p2++;
                                        *p3++ = *p1++;
                                        p2++;

-                               }
-                               else {
+                               } else {

                                        while (compar_state(p1, p2) == -1) ++p1;
                                        while (compar_state(p1, p2) == 1) ++p2;
                                }
                        }
                                        while (compar_state(p1, p2) == -1) ++p1;
                                        while (compar_state(p1, p2) == 1) ++p2;
                                }
                        }

-                       key_count = p3 - last_keylist;;
-               }
-               else
+                       key_count = p3 - last_keylist;
+               } else {

                        key_count = 0;
                        key_count = 0;

-       else
-       {
+               }
+       } else {

                last_keylist = state_s;
                key_count = i;
        }
        
                last_keylist = state_s;
                key_count = i;
        }
        

-       printf("key_count:%d\n", key_count);
+       printf("key candidates count: %d\n", key_count);

 
        // The list may still contain several key candidates. Test each of them with mfCheckKeys
 
        // The list may still contain several key candidates. Test each of them with mfCheckKeys

+       int res;
+       uint8_t keyBlock[6];
+       uint64_t key64;

        for (i = 0; i < key_count; i++) {
        for (i = 0; i < key_count; i++) {

-               uint8_t keyBlock[6];
-               uint64_t key64;
+

                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);
                key64 = 0;
                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);
                key64 = 0;

-               if (!mfCheckKeys(0, 0, false, 1, keyBlock, &key64)) {
+               // Call tag to verify if key is correct
+               res = mfCheckKeys(0, 0, false, 1, keyBlock, &key64);
+               if (!res) {

                        *key = key64;
                        free(last_keylist);
                        last_keylist = NULL;
                        *key = key64;
                        free(last_keylist);
                        last_keylist = NULL;

-                       if (par_info ==0)
+                       if (par_info == 0)

                                free(state);
                        return 0;
                }
        }       
                                free(state);
                        return 0;
                }
        }       

-

        
        free(last_keylist);
        last_keylist = state_s;
        
        free(last_keylist);
        last_keylist = state_s;

-       

        return 1;
 }
 
        return 1;
 }
 

+// *outputkey is not used...

 int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 
        struct Crypto1State *s,*t;
 int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 
        struct Crypto1State *s,*t;


@@ -188,24 +196,25 @@ int tryMfk32(uint64_t myuid, uint8_t *data, uint8_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))) {
                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"llx"]", key);

                        isSuccess = TRUE;
                        ++counter;
                        if (counter==20)
                                break;
                }
        }
                        isSuccess = TRUE;
                        ++counter;
                        if (counter==20)
                                break;
                }
        }

-       free(s);
+       crypto1_destroy(t);
+       crypto1_destroy(s);

        return isSuccess;
 }
 
 int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 
        return isSuccess;
 }
 
 int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 

-       struct Crypto1State *s,*t;
+       struct Crypto1State *s, *t;

        uint64_t key;     // recovered key
        uint32_t uid;     // serial number
        uint64_t key;     // recovered key
        uint32_t uid;     // serial number

-       uint32_t nt0;      // tag challenge first
-       uint32_t nt1;      // tag challenge second
+       uint32_t nt0;     // tag challenge first
+       uint32_t nt1;     // tag challenge second

        uint32_t nr0_enc; // first encrypted reader challenge
        uint32_t ar0_enc; // first encrypted reader response
        uint32_t nr1_enc; // second encrypted reader challenge
        uint32_t nr0_enc; // first encrypted reader challenge
        uint32_t ar0_enc; // first encrypted reader response
        uint32_t nr1_enc; // second encrypted reader challenge


@@ -239,11 +248,11 @@ int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
                                break;
                }
        }
                                break;
                }
        }

-       free(s);
+       crypto1_destroy(t);
+       crypto1_destroy(s);

        return isSuccess;
 }
 
        return isSuccess;
 }
 

-

 int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 
        struct Crypto1State *revstate;
 int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
 
        struct Crypto1State *revstate;


@@ -287,6 +296,5 @@ int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
        crypto1_get_lfsr(revstate, &key);
        PrintAndLog("Found Key: [%012"llx"]",key);
        crypto1_destroy(revstate);
        crypto1_get_lfsr(revstate, &key);
        PrintAndLog("Found Key: [%012"llx"]",key);
        crypto1_destroy(revstate);

-       crypto1_destroy(pcs);

        return 0;
        return 0;

-}
+}
\ No newline at end of file