adjust ManchesterEncode

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 2c47bc50213dcf767f9d12d342df1c0945082e62..a6b33e9360d3c705b7790c30d3573f4f8090f020 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -10,12 +10,13 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 

-#define __STDC_FORMAT_MACROS

 #include <inttypes.h>
 #include <inttypes.h>

+#include <time.h>

 
 #include "nonce2key.h"
 #include "mifarehost.h"
 #include "ui.h"
 
 #include "nonce2key.h"
 #include "mifarehost.h"
 #include "ui.h"

+#include "util.h"

 
 int compar_state(const void * a, const void * b) {
        // didn't work: (the result is truncated to 32 bits)
 
 int compar_state(const void * a, const void * b) {
        // didn't work: (the result is truncated to 32 bits)


@@ -161,7 +162,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
        uint32_t nr1_enc = data.nr2; // second encrypted reader challenge
        uint32_t ar1_enc = data.ar2; // second encrypted reader response
        clock_t t1 = clock();
        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;

        uint8_t counter=0;
 
        s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
        uint8_t counter=0;
 
        s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);


@@ -208,7 +209,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
        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        
        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;
+       bool isSuccess = false;

        int counter = 0;
        
        //PrintAndLog("Enter mfkey32_moebius");
        int counter = 0;
        
        //PrintAndLog("Enter mfkey32_moebius");