X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/652c39c63bce093cec80b174dfb0d8154e7c6827..4490a4769074e6b5a91f9da1bee2296ac2b42f5f:/client/cmdhfmf.h diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h index 45ba7cb1..738b3432 100644 --- a/client/cmdhfmf.h +++ b/client/cmdhfmf.h @@ -16,13 +16,16 @@ #include #include #include "proxmark3.h" -#include "../common/iso14443crc.h" +#include "iso14443crc.h" #include "data.h" #include "ui.h" #include "cmdparser.h" -#include "../include/common.h" +#include "common.h" #include "util.h" -#include "mifarehost.h" +//#include "mifarehost.h" +#include "mifare.h" // nonces_t struct +#include "cmdhfmfhard.h" +#include "nonce2key/nonce2key.h" int CmdHFMF(const char *Cmd); @@ -38,8 +41,10 @@ int CmdHF14AMfUWrBl(const char* cmd); int CmdHF14AMfChk(const char* cmd); int CmdHF14AMifare(const char* cmd); int CmdHF14AMfNested(const char* cmd); +int CmdHF14AMfNestedHard(const char *Cmd); int CmdHF14AMfSniff(const char* cmd); int CmdHF14AMf1kSim(const char* cmd); +int CmdHF14AMfKeyBrute(const char *Cmd); int CmdHF14AMfEClear(const char* cmd); int CmdHF14AMfEGet(const char* cmd); int CmdHF14AMfESet(const char* cmd); @@ -53,5 +58,8 @@ int CmdHF14AMfCGetBlk(const char* cmd); int CmdHF14AMfCGetSc(const char* cmd); int CmdHF14AMfCLoad(const char* cmd); int CmdHF14AMfCSave(const char* cmd); -int GetCardSize(); +int CmdHf14MfDecryptBytes(const char *Cmd); + +void readerAttack(nonces_t data[], bool setEmulatorMem); +void printKeyTable( uint8_t sectorscnt, sector *e_sector ); #endif