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

Improved error detection and message if missing paramters for 'hf mf hardnested'

Browse Source
This commit is contained in:
Brian Pow
2018-02-09 00:44:17 +08:00
parent 35e62e7d1f
commit e1bc58692d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/cmdhfmf.c
View File

@@ -1261,6 +1261,12 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
cmdp+=2; cmdp+=2;
break; break;
default: default:
if(param_getchar(Cmd, cmdp) == 0x00)
{
PrintAndLog("Block number is missing");
return 1;
}
blockNo = param_get8(Cmd, cmdp); blockNo = param_get8(Cmd, cmdp);
ctmp = param_getchar(Cmd, cmdp+1); ctmp = param_getchar(Cmd, cmdp+1);
if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
@@ -1276,7 +1282,14 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
return 1; return 1;
} }
if(param_getchar(Cmd, cmdp+3) == 0x00)
{
PrintAndLog("Target block number is missing");
return 1;
}
trgBlockNo = param_get8(Cmd, cmdp+3); trgBlockNo = param_get8(Cmd, cmdp+3);
ctmp = param_getchar(Cmd, cmdp+4); ctmp = param_getchar(Cmd, cmdp+4);
if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {
PrintAndLog("Target key type must be A or B"); PrintAndLog("Target key type must be A or B");