Merge pull request #49 from micolous/less-verbose-mfsim

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

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index 30b66516a50882e1abac9833f0d7a66b82f45300..b274feca59ea5affb48bf8f7012fe2da2f9212b3 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -2,7 +2,8 @@
 // Merlok - June 2011
 // Roel - Dec 2009
 // Unknown author
 // Merlok - June 2011
 // Roel - Dec 2009
 // Unknown author

-// icemane - may 2015
+// iceman - may 2015
+// marshmellow42 - june 2016

 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.


@@ -17,9 +18,17 @@
 #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"                        // PrintAndLog
+#include "proxmark3.h"
+#include "mifarehost.h"

 
 

-int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key); 
-int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey );
-int tryMfk32_moebius(uint64_t myuid, uint8_t *data, uint8_t *outputkey );
-int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey );
+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(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, bool showMaths );  // <<-- 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
 #endif