X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db09cb3adbe715b058a64357184e4963a8b6d78e..46cd801c5ad5d5f60b2526b4a1e6700a2a008f7b:/client/nonce2key/nonce2key.h diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h index 0f577cf8..82c65b55 100644 --- 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 // 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. @@ -13,11 +13,12 @@ #ifndef __NONCE2KEY_H #define __NONCE2KEY_H -#include #include +#include #include "crapto1.h" #include "common.h" -int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key); - +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 tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ); #endif