FIX: "hf mf hardnested" when "key found" exting the do-while loop doesn't need to...

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

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index 45bbcea0bc63845377ba751ac5b05d8fcda14a2d..026b8cfc47cd041617b4d5b303aa95afef9d8bde 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -18,17 +18,17 @@
 #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); 
-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 );
-bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey );  // <<-- this one has best success
+bool tryMfk32(nonces_t data, uint64_t *outputkey, bool verbose );
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey, bool verbose);  // <<-- this one has best success
 int tryMfk64_ex(uint8_t *data, uint64_t *outputkey );
 int tryMfk64(uint32_t uid, uint32_t nt, uint32_t nr_enc, uint32_t ar_enc, uint32_t at_enc, uint64_t *outputkey);
 #endif