github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

specify key in the command line

Browse source
This commit is contained in:
merlokk 2019-11-29 17:29:36 +02:00
commit a861d2971c
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/cmdhfmfp.c
View file

@ -735,17 +735,30 @@ static int CmdHFMFPChk(const char *cmd) {
bool keyB = arg_get_lit(2); bool keyB = arg_get_lit(2);
uint8_t startSector = arg_get_int_def(3, 0); uint8_t startSector = arg_get_int_def(3, 0);
uint8_t endSector = arg_get_int_def(4, 0); uint8_t endSector = arg_get_int_def(4, 0);
uint8_t vkey[16] = {0}; uint8_t vkey[16] = {0};
int vkeylen = 0; int vkeylen = 0;
CLIGetHexWithReturn(5, vkey, &vkeylen); CLIGetHexWithReturn(5, vkey, &vkeylen);
if (vkeylen > 0) {
if (vkeylen == 16) {
memcpy(&keyList[keyListLen], vkey, 16);
keyListLen++;
} else {
PrintAndLogEx(ERROR, "Specified key must have 16 bytes length.");
return PM3_EINVARG;
}
}
bool pattern1b = arg_get_lit(7); bool pattern1b = arg_get_lit(7);
bool pattern2b = arg_get_lit(8); bool pattern2b = arg_get_lit(8);
uint16_t startPattern = 0x0000; uint16_t startPattern = 0x0000;
uint8_t vpattern[2]; uint8_t vpattern[2];
int vpatternlen = 0; int vpatternlen = 0;
CLIGetHexWithReturn(9, vpattern, &vpatternlen); CLIGetHexWithReturn(9, vpattern, &vpatternlen);
if (vpatternlen > 0 && vpatternlen <= 2) if (vpatternlen > 0 && vpatternlen <= 2)
startPattern = (vpattern[0] << 8) + vpattern[1]; startPattern = (vpattern[0] << 8) + vpattern[1];
CLIParserFree(); CLIParserFree();
uint8_t startKeyAB = 0; uint8_t startKeyAB = 0;
@ -793,7 +806,7 @@ static int CmdHFMFPChk(const char *cmd) {
if (keyListLen == 0) { if (keyListLen == 0) {
PrintAndLogEx(ERROR, "Key list is empty. Nothing to check."); PrintAndLogEx(ERROR, "Key list is empty. Nothing to check.");
return 1; return PM3_EINVARG;
} }