CHG: @marshmellow42 's XL size, and em4x05 timmings.

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index b7ab7c322726270c2e89885729a24d4cd229f3c1..3c3d3e198c7b91d97e47c1cc38d530b7b0c23296 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -9,176 +9,207 @@
 //-----------------------------------------------------------------------------
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------

+#include "nonce2key.h"

 
 

-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#define llx PRIx64
+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 = 0, nr_diff;
+       byte_t bt, ks3x[8], par[8][8];

 
 

-#include "nonce2key.h"
-#include "mifarehost.h"
-#include "ui.h"
+       // Reset the last three significant bits of the reader nonce
+       nr &= 0xffffff1f;
+  
+       PrintAndLog("uid(%08x) nt(%08x) par(%016" PRIx64") ks(%016" PRIx64") nr(%08x)", 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;
+               }
+       }
+
+       PrintAndLog("+----+--------+---+-----+---------------+");
+       PrintAndLog("|diff|{nr}    |ks3|ks3^5|parity         |");
+       PrintAndLog("+----+--------+---+-----+---------------+");
+       for ( i = 0; i < 8; i++) {
+               nr_diff = nr | i << 5;
+
+               PrintAndLog("| %02x |%08x| %01x |  %01x  |%01x,%01x,%01x,%01x,%01x,%01x,%01x,%01x|",
+                       i << 5, nr_diff, ks3x[i], ks3x[i]^5,
+                       par[i][0], par[i][1], par[i][2], par[i][3],
+                       par[i][4], par[i][5], par[i][6], par[i][7]);
+
+       }
+       PrintAndLog("+----+--------+---+-----+---------------+");
+
+       clock_t t1 = clock();

 
 

-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);
+       state = lfsr_common_prefix(nr, rr, ks3x, par);
+       lfsr_rollback_word(state, uid ^ nt, 0);
+       crypto1_get_lfsr(state, key);
+       crypto1_destroy(state);

 
 

-       // better:
+       t1 = clock() - t1;
+       if ( t1 > 0 ) PrintAndLog("Time in nonce2key: %.0f ticks", (float)t1);
+       return 0;
+}
+
+int compar_intA(const void * a, const void * b) {

        if (*(int64_t*)b == *(int64_t*)a) return 0;
        if (*(int64_t*)b == *(int64_t*)a) return 0;

-       else if (*(int64_t*)b > *(int64_t*)a) return 1;
-       else return -1;
+       if (*(int64_t*)b > *(int64_t*)a) return 1;
+       return -1;

 }
 
 }
 

-int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, 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;
        struct Crypto1State *state;

-       uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2;
-       byte_t bt, ks3x[8], par[8][8];
+       uint32_t i, pos, key_count;
+       uint8_t ks3x[8];

        uint64_t key_recovered;
        int64_t *state_s;
        uint64_t key_recovered;
        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;

-       rr = 0;

   
   

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

-  
-       PrintAndLog("\nuid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n\n", uid, nt, par_info, ks_info, nr);
-
+ 
+       // split keystream into array

        for (pos=0; pos<8; pos++) {
                ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
        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;
-               }

        }
        }

+ 
+       // find possible states for this keystream
+       state = lfsr_common_prefix_ex(nr, ks3x);

 
 

-       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 (!state) {
+               PrintAndLog("Failed getting states");
+               return 1;

        }
        }

-       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_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++)
-       {
-               lfsr_rollback_word(state+i, uid^nt, 0);
+       uint32_t xored = uid ^ nt;
+       
+       for (i = 0; (state) && ((state + i)->odd != -1); i++) {
+               lfsr_rollback_word(state + i, xored, 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;
-       
-       qsort(state_s, i, sizeof(*state_s), compar_state);
+
+       qsort(state_s, i, sizeof(int64_t), compar_intA);

        *(state_s + i) = -1;
        
        *(state_s + i) = -1;
        

+       // first call to this function.  clear all other stuff and set new found states.
+       if (last_keylist == NULL) {
+               free(last_keylist);
+               last_keylist = state_s;
+               PrintAndLog("parity is all zero, testing special attack. First call, this attack needs at least two calls. Hold on...");                
+               PrintAndLog("uid(%08x) nt(%08x) ks(%016" PRIx64") nr(%08x)", uid, nt, ks_info, nr);
+               return 1;
+       }
+
+       PrintAndLog("uid(%08x) nt(%08x) ks(%016" PRIx64") nr(%08x)", uid, nt, ks_info, nr);
+               

        //Create the intersection:
        //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;
+       int64_t *p1, *p2, *p3;
+       p1 = p3 = last_keylist; 
+       p2 = state_s;
+               
+       while ( *p1 != -1 && *p2 != -1 ) {
+               if (compar_intA(p1, p2) == 0) {
+                       PrintAndLog("p1:%" PRIx64" p2:%" PRIx64" p3:%" PRIx64" key:%012" PRIx64
+                               , (uint64_t)(p1-last_keylist)
+                               , (uint64_t)(p2-state_s)
+                               , (uint64_t)(p3-last_keylist)
+                               , *p1
+                       );
+                       *p3++ = *p1++;
+                       p2++;

                }
                }

-       } else {
-               last_keylist = state_s;
-               key_count = i;
+               else {
+                       while (compar_intA(p1, p2) == -1) ++p1;
+                       while (compar_intA(p1, p2) == 1) ++p2;
+               }
+       }
+       key_count = p3 - last_keylist;
+       PrintAndLog("key_count: %d", key_count);
+       if ( key_count == 0 ){
+               free(state);
+               state = NULL;
+               return 0;

        }
        
        }
        

-       printf("key candidates count: %d\n", key_count);
-
-       // The list may still contain several key candidates. Test each of them with mfCheckKeys
-       int res;
-       uint8_t keyBlock[6];
+       uint8_t retval = 1;
+       // Validate all key candidates with testing each of them with mfCheckKeys
+       uint8_t keyBlock[6] = {0,0,0,0,0,0};

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

-

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

-               res = mfCheckKeys(0, 0, false, 1, keyBlock, &key64);
-               if (!res) {
+               if (!mfCheckKeys(blockno, keytype, false, 1, keyBlock, &key64)) {

                        *key = key64;
                        *key = key64;

-                       free(last_keylist);
-                       last_keylist = NULL;
-                       if (par_info == 0)
-                               free(state);
-                       return 0;
+                       retval = 0;
+                       goto out;

                }
                }

-       }       
+       }

        
        

+out:

        free(last_keylist);
        free(last_keylist);

-       last_keylist = state_s;
-       return 1;
+       last_keylist = NULL;
+       free(state);
+       state = NULL;
+       return retval;

 }
 
 }
 

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

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

-       uint64_t key;     // recovered key
-       uint32_t uid;     // serial number
-       uint32_t nt;      // tag 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
-       uint32_t ar1_enc; // 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

        bool isSuccess = FALSE;
        bool isSuccess = FALSE;

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

        
        

-       uid     = myuid;//(uint32_t)bytes_to_num(data +  0, 4);
-       nt              = *(uint32_t*)(data+8);
-       nr0_enc = *(uint32_t*)(data+12);
-       ar0_enc = *(uint32_t*)(data+16);
-       nr1_enc = *(uint32_t*)(data+32);
-       ar1_enc = *(uint32_t*)(data+36);
-
-       // PrintAndLog("recovering key for:");
-       // PrintAndLog("    uid: %08x   %08x",uid, myuid);
-       // PrintAndLog("     nt: %08x",nt);
-       // PrintAndLog(" {nr_0}: %08x",nr0_enc);
-       // PrintAndLog(" {ar_0}: %08x",ar0_enc);
-       // PrintAndLog(" {nr_1}: %08x",nr1_enc);
-       // PrintAndLog(" {ar_1}: %08x",ar1_enc);
-
-       s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
+       clock_t t1 = clock();
+       uint32_t p64 = prng_successor(nt, 64);
+               
+       if ( verbose ) {
+               PrintAndLog("Recovering key for:");
+               PrintAndLog("    uid: %08x",uid);
+               PrintAndLog("     nt: %08x",nt);
+               PrintAndLog(" {nr_0}: %08x",nr0_enc);
+               PrintAndLog(" {ar_0}: %08x",ar0_enc);
+               PrintAndLog(" {nr_1}: %08x",nr1_enc);
+               PrintAndLog(" {ar_1}: %08x",ar1_enc);
+               PrintAndLog("\nLFSR succesors of the tag challenge:");
+               PrintAndLog("  nt': %08x", p64);
+               PrintAndLog(" nt'': %08x", prng_successor(p64, 32));
+       }
+       
+       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);


@@ -187,41 +218,56 @@ int tryMfk32(uint64_t myuid, uint8_t *data, uint8_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)) {
+                       outkey = key;

                        ++counter;
                        ++counter;

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

                }
        }
                }
        }

-       free(s);
+       isSuccess = (counter > 0);
+       t1 = clock() - t1;
+       if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks  - possible keys %d", (float)t1, counter);
+
+       *outputkey = ( isSuccess ) ? outkey : 0;        
+       crypto1_destroy(s);

        return isSuccess;
 }
 
        return isSuccess;
 }
 

-int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
-
-       struct Crypto1State *s,*t;
-       uint64_t key;     // recovered key
-       uint32_t uid;     // serial number
-       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 ar1_enc; // second encrypted reader response   
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey, bool verbose) {
+       struct Crypto1State *s, *t;
+       uint64_t outkey  = 0;
+       uint64_t key     = 0;                        // recovered key
+       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 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;

-       
-       uid     = myuid;//(uint32_t)bytes_to_num(data +  0, 4);
-       nt0     = *(uint32_t*)(data+8);
-       nr0_enc = *(uint32_t*)(data+12);
-       ar0_enc = *(uint32_t*)(data+16);
-       nt1     = *(uint32_t*)(data+8);
-       nr1_enc = *(uint32_t*)(data+32);
-       ar1_enc = *(uint32_t*)(data+36);

 
 

-       s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0);
+       clock_t t1 = clock();
+
+       uint32_t p640 = prng_successor(nt0, 64);
+       uint32_t p641 = prng_successor(nt1, 64);
+       
+       if (verbose) {
+               PrintAndLog("Recovering key for:");
+               PrintAndLog("    uid: %08x", uid);
+               PrintAndLog("   nt_0: %08x", nt0);
+               PrintAndLog(" {nr_0}: %08x", nr0_enc);
+               PrintAndLog(" {ar_0}: %08x", ar0_enc);
+               PrintAndLog("   nt_1: %08x", nt1);
+               PrintAndLog(" {nr_1}: %08x", nr1_enc);
+               PrintAndLog(" {ar_1}: %08x", ar1_enc);
+               PrintAndLog("\nLFSR succesors of the tag challenge:");
+               PrintAndLog("  nt': %08x", p640);
+               PrintAndLog(" nt'': %08x", prng_successor(p640, 32));
+       }
+       
+       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);


@@ -231,61 +277,55 @@ int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_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)) {
+                       outkey=key;

                        ++counter;
                        ++counter;

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

                }
        }
                }
        }

-       free(s);
+    isSuccess  = (counter > 0);
+       t1 = clock() - t1;
+       if (verbose) {
+               if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks  - possible keys %d", (float)t1, counter);
+       }
+       *outputkey = ( isSuccess ) ? outkey : 0;
+       crypto1_destroy(s);

        return isSuccess;
 }
 
        return isSuccess;
 }
 

-int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){
+int tryMfk64_ex(uint8_t *data, uint64_t *outputkey){
+       uint32_t uid    = le32toh(data);
+       uint32_t nt     = le32toh(data+4);  // tag challenge
+       uint32_t nr_enc = le32toh(data+8);  // encrypted reader challenge
+       uint32_t ar_enc = le32toh(data+12); // encrypted reader response        
+       uint32_t at_enc = le32toh(data+16);     // encrypted tag response
+       return tryMfk64(uid, nt, nr_enc, ar_enc, at_enc, 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

        struct Crypto1State *revstate;
        struct Crypto1State *revstate;

-       uint64_t key;     // recovered key
-       uint32_t uid;     // serial number
-       uint32_t nt;      // tag challenge
-       uint32_t nr_enc;  // encrypted reader challenge
-       uint32_t ar_enc;  // encrypted reader response
-       uint32_t at_enc;  // encrypted tag response
-       uint32_t ks2;     // keystream used to encrypt reader response
-       uint32_t ks3;     // keystream used to encrypt tag response
-
-       struct Crypto1State mpcs = {0, 0};
-       struct Crypto1State *pcs;
-       pcs = &mpcs;

        
        

-       uid     = myuid;//(uint32_t)bytes_to_num(data +  0, 4);
-       nt              = *(uint32_t*)(data+8);
-       nr_enc = *(uint32_t*)(data+12);
-       ar_enc = *(uint32_t*)(data+16);
+       PrintAndLog("Enter mfkey64");
+       clock_t t1 = clock();

        
        

-       crypto1_word(pcs, nr_enc , 1);
-       at_enc = prng_successor(nt, 96) ^ crypto1_word(pcs, 0, 0);
-
-       // printf("Recovering key for:\n");
-       // printf("  uid: %08x\n",uid);
-       // printf("   nt: %08x\n",nt);
-       // printf(" {nr}: %08x\n",nr_enc);
-       // printf(" {ar}: %08x\n",ar_enc);
-       // printf(" {at}: %08x\n",at_enc);
-

        // Extract the keystream from the messages
        ks2 = ar_enc ^ prng_successor(nt, 64);
        ks3 = at_enc ^ prng_successor(nt, 96);
        // Extract the keystream from the messages
        ks2 = ar_enc ^ prng_successor(nt, 64);
        ks3 = at_enc ^ prng_successor(nt, 96);

-

        revstate = lfsr_recovery64(ks2, ks3);
        lfsr_rollback_word(revstate, 0, 0);
        lfsr_rollback_word(revstate, 0, 0);
        lfsr_rollback_word(revstate, nr_enc, 1);
        lfsr_rollback_word(revstate, uid ^ nt, 0);
        crypto1_get_lfsr(revstate, &key);
        revstate = lfsr_recovery64(ks2, ks3);
        lfsr_rollback_word(revstate, 0, 0);
        lfsr_rollback_word(revstate, 0, 0);
        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);
+       t1 = clock() - t1;
+       if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks", (float)t1);
+
+       *outputkey = key;

        crypto1_destroy(revstate);
        crypto1_destroy(revstate);

-       crypto1_destroy(pcs);

        return 0;
        return 0;

-}
\ No newline at end of file
+}