X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f0e183ece4b5d0a46857bf8386de5cac9ed76a79..bbcd41a6e54b67b459f1d51c130b7ca651686f92:/client/nonce2key/nonce2key.h diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h index 45bbcea0..e8e2a01b 100644 --- a/client/nonce2key/nonce2key.h +++ b/client/nonce2key/nonce2key.h @@ -18,13 +18,13 @@ #include #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 );