dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHG: 'hf mf list' - readded it. calls trace list mf in the back

Browse Source
This commit is contained in:
iceman1001
2019-02-22 09:43:03 +01:00
parent 43bd82b778
commit 140c327cc2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/cmdhfmf.c
View File

@@ -434,7 +434,7 @@ char * GenerateFilename(const char *prefix, const char *suffix){
return fptr; return fptr;
} }
int CmdHF14ADarkside(const char *Cmd) { int CmdHF14AMfDarkside(const char *Cmd) {
uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA; uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
uint64_t key = 0; uint64_t key = 0;
@@ -3174,7 +3174,7 @@ out:
return 0; return 0;
} }
int CmdHF14AMfAuth4(const char *cmd) { int CmdHF14AMfAuth4(const char *Cmd) {
uint8_t keyn[20] = {0}; uint8_t keyn[20] = {0};
int keynlen = 0; int keynlen = 0;
uint8_t key[16] = {0}; uint8_t key[16] = {0};
@@ -3191,7 +3191,7 @@ int CmdHF14AMfAuth4(const char *cmd) {
arg_str1(NULL, NULL, "<Key Value (HEX 16 bytes)>", NULL), arg_str1(NULL, NULL, "<Key Value (HEX 16 bytes)>", NULL),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(cmd, argtable, true); CLIExecWithReturn(Cmd, argtable, true);
CLIGetHexWithReturn(1, keyn, &keynlen); CLIGetHexWithReturn(1, keyn, &keynlen);
CLIGetHexWithReturn(2, key, &keylen); CLIGetHexWithReturn(2, key, &keylen);
@@ -3210,9 +3210,15 @@ int CmdHF14AMfAuth4(const char *cmd) {
return MifareAuth4(NULL, keyn, key, true, false, true); return MifareAuth4(NULL, keyn, key, true, false, true);
} }
int CmdHF14AMfList(const char *Cmd) {
CmdTraceList("mf");
return 0;
}
static command_t CommandTable[] = { static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"darkside", CmdHF14ADarkside, 0, "Darkside attack. read parity error messages."}, {"list", CmdHF14AMfList, 0, "[Deprecated] List ISO 14443-a / Mifare history"},
{"darkside", CmdHF14AMfDarkside, 0, "Darkside attack. read parity error messages."},
{"nested", CmdHF14AMfNested, 0, "Nested attack. Test nested authentication"}, {"nested", CmdHF14AMfNested, 0, "Nested attack. Test nested authentication"},
{"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"}, {"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"},
{"keybrute", CmdHF14AMfKeyBrute, 0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"}, {"keybrute", CmdHF14AMfKeyBrute, 0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"},

3
client/cmdhfmf.h
View File

@@ -35,6 +35,7 @@
extern int CmdHFMF(const char *Cmd); extern int CmdHFMF(const char *Cmd);
extern int CmdHF14AMfList(const char *Cmd);
extern int CmdHF14AMfDbg(const char* cmd); extern int CmdHF14AMfDbg(const char* cmd);
extern int CmdHF14AMfRdBl(const char* cmd); extern int CmdHF14AMfRdBl(const char* cmd);
extern int CmdHF14AMfURdBl(const char* cmd); extern int CmdHF14AMfURdBl(const char* cmd);
@@ -45,7 +46,7 @@ extern int CmdHF14AMfRestore(const char* cmd);
extern int CmdHF14AMfWrBl(const char* cmd); extern int CmdHF14AMfWrBl(const char* cmd);
extern int CmdHF14AMfUWrBl(const char* cmd); extern int CmdHF14AMfUWrBl(const char* cmd);
extern int CmdHF14AMfChk(const char* cmd); extern int CmdHF14AMfChk(const char* cmd);
extern int CmdHF14ADarkside(const char* cmd); extern int CmdHF14AMfDarkside(const char* cmd);
extern int CmdHF14AMfNested(const char* cmd); extern int CmdHF14AMfNested(const char* cmd);
extern int CmdHF14AMfNestedHard(const char *Cmd); extern int CmdHF14AMfNestedHard(const char *Cmd);
//extern int CmdHF14AMfSniff(const char* cmd); //extern int CmdHF14AMfSniff(const char* cmd);