github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

key number not mandatory

Browse source
This commit is contained in:
merlokk 2018-10-18 20:23:25 +03:00
commit 5470e507b2
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhfmfp.c
View file

@ -23,6 +23,8 @@
#include "mifare.h" #include "mifare.h"
#include "cliparser/cliparser.h" #include "cliparser/cliparser.h"
static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
int CmdHFMFPInfo(const char *cmd) { int CmdHFMFPInfo(const char *cmd) {
@ -112,13 +114,14 @@ int CmdHFMFPWritePerso(const char *cmd) {
CLIParserInit("hf mfp wrp", CLIParserInit("hf mfp wrp",
"Executes Write Perso command. Can be used in SL0 mode only.", "Executes Write Perso command. Can be used in SL0 mode only.",
"Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"); "Usage:\n\thf mfp wrp 4000 000102030405060708090a0b0c0d0e0f -> write key (00..0f) to key number 4000 \n"
"\thf mfp wrp 4000 -> write default key(0xff..0xff) to key number 4000");
void* argtable[] = { void* argtable[] = {
arg_param_begin, arg_param_begin,
arg_lit0("vV", "verbose", "show internal data."), arg_lit0("vV", "verbose", "show internal data."),
arg_str1(NULL, NULL, "<HEX key number (2b)>", NULL), arg_str1(NULL, NULL, "<HEX key number (2b)>", NULL),
arg_strx1(NULL, NULL, "<HEX key (16b)>", NULL), arg_strx0(NULL, NULL, "<HEX key (16b)>", NULL),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(cmd, argtable, true); CLIExecWithReturn(cmd, argtable, true);
@ -128,6 +131,11 @@ int CmdHFMFPWritePerso(const char *cmd) {
CLIGetHexWithReturn(3, key, &keyLen); CLIGetHexWithReturn(3, key, &keyLen);
CLIParserFree(); CLIParserFree();
if (!keyLen) {
memmove(key, DefaultKey, 16);
keyLen = 16;
}
if (keyNumLen != 2) { if (keyNumLen != 2) {
PrintAndLog("Key number length must be 2 bytes instead of: %d", keyNumLen); PrintAndLog("Key number length must be 2 bytes instead of: %d", keyNumLen);
return 1; return 1;