minor bugfix and enhancement to hf 14a reader

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index d2e50d5ef84f35dd22b507018969b0dfac7b1d0c..111f58cd6b07a8d21ddff7e006e5de485bf4830b 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -15,19 +15,40 @@
 #define llx PRIx64
 
 #include "nonce2key.h"
 #define llx PRIx64
 
 #include "nonce2key.h"

+#include "mifarehost.h"

 #include "ui.h"
 
 #include "ui.h"
 

+int compar_state(const void * a, const void * b) {
+       // didn't work: (the result is truncated to 32 bits)
+       //return (*(int64_t*)b - *(int64_t*)a);
+
+       // better:
+       if (*(int64_t*)b == *(int64_t*)a) return 0;
+       else if (*(int64_t*)b > *(int64_t*)a) return 1;
+       else return -1;
+}
+

 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, *state_s;
-  uint32_t pos, rr, nr_diff;//, ks1, ks2;
-  byte_t bt, i, ks3x[8], par[8][8];
+  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;
   uint64_t key_recovered;

+  int64_t *state_s;
+  static uint32_t last_uid;
+  static int64_t *last_keylist;

   rr = 0;
   
   rr = 0;
   

+  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")\n\n",uid,nt,par_info,ks_info);
+  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++)
   {
 
   for (pos=0; pos<8; pos++)
   {


@@ -50,20 +71,81 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
     printf("%01x|\n", par[i][7]);
   }
   
     printf("%01x|\n", par[i][7]);
   }
   

-  state = lfsr_common_prefix(nr, rr, ks3x, par);
-       state_s = 0;
-       for (i = 0; (state) && ((state + i)->odd != 0 || (state + i)->even != 0) && (i < 10); i++)
+       if (par_info==0)
+               PrintAndLog("parity is all zero,try special attack!just wait for few more seconds...");
+  
+       state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
+       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++)

        {
        {

-    printf("%08x|%08x\n",(state+i)->odd, (state+i)->even);
-               state_s = state + 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);

        }
        }

-  if (!state_s) return 1;
+       //fclose(fp);

        
        

-  lfsr_rollback_word(state_s, uid^nt, 0);
-  crypto1_get_lfsr(state_s, &key_recovered);
-  if (!state) free(state);
+       if(!state)
+               return 1;

        
        

-       *key = key_recovered;
-  
-  return 0;
+       qsort(state_s, i, sizeof(*state_s), compar_state);
+       *(state_s + i) = -1;
+       
+       //Create the intersection:
+       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);
+                                       *p3++ = *p1++;
+                                       p2++;
+                               }
+                               else {
+                                       while (compar_state(p1, p2) == -1) ++p1;
+                                       while (compar_state(p1, p2) == 1) ++p2;
+                               }
+                       }
+                       key_count = p3 - last_keylist;;
+               }
+               else
+                       key_count = 0;
+       else
+       {
+               last_keylist = state_s;
+               key_count = i;
+       }
+       
+       printf("key_count:%d\n", key_count);
+
+       // The list may still contain several key candidates. Test each of them with mfCheckKeys
+       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;
+               if (!mfCheckKeys(0, 0, 1, keyBlock, &key64)) {
+                       *key = key64;
+                       free(last_keylist);
+                       last_keylist = NULL;
+                       if (par_info ==0)
+                               free(state);
+                       return 0;
+               }
+       }       
+
+       
+       free(last_keylist);
+       last_keylist = state_s;
+       
+       return 1;

 }
 }