CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.

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

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index 45bbcea0bc63845377ba751ac5b05d8fcda14a2d..e8e2a01b88d9bd1d6ab2311c8163772365b7263b 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -18,13 +18,13 @@
 #include <stdlib.h>
 #include "crapto1.h"
 #include "common.h"
 #include <stdlib.h>
 #include "crapto1.h"
 #include "common.h"

-#include "mifare.h" // nonces_t struct
-#include "ui.h"
+#include "mifare.h"    // nonces_t struct
+#include "ui.h"                        // PrintAndLog

 #include "proxmark3.h"
 #include "mifarehost.h"
 
 extern int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key); 
 #include "proxmark3.h"
 #include "mifarehost.h"
 
 extern int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key); 

-extern int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint64_t * key);
+extern 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);

 
 //iceman, added these to be able to crack key direct from "hf 14 sim" && "hf mf sim"
 bool tryMfk32(nonces_t data, uint64_t *outputkey );
 
 //iceman, added these to be able to crack key direct from "hf 14 sim" && "hf mf sim"
 bool tryMfk32(nonces_t data, uint64_t *outputkey );