CHG: updated the downloaded release from v1.4.0 -> v1.5.0

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

diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index 30b66516a50882e1abac9833f0d7a66b82f45300..162b6074178d0cbe79ec7bdd1cc31ff64ff01dbe 100644 (file)
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -2,7 +2,7 @@
 // Merlok - June 2011
 // Roel - Dec 2009
 // Unknown author
-// icemane - may 2015
+// iceman - may 2015
 // 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.
@@ -19,7 +19,12 @@
 #include "common.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 );
+
+int nonce2key_ex(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"
+int tryMfk32(uint8_t *data, uint64_t *outputkey );
+int tryMfk32_moebius(uint8_t *data, uint64_t *outputkey );  // <<-- 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