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

Fix parameter i parsing bug.

Browse source
This commit is contained in:
Thomas Sutter 2019-10-29 12:52:45 +01:00
commit 83c629cbec
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/cmdhffelica.c
View file

@ -112,6 +112,7 @@ static int usage_hf_felica_request_response(void) {
PrintAndLogEx(NORMAL, "\nUsage: hf felica rqresponse [-h]"); PrintAndLogEx(NORMAL, "\nUsage: hf felica rqresponse [-h]");
PrintAndLogEx(NORMAL, " -h this help"); PrintAndLogEx(NORMAL, " -h this help");
PrintAndLogEx(NORMAL, " -i <0A0B0C ... hex> set custom IDm to use"); PrintAndLogEx(NORMAL, " -i <0A0B0C ... hex> set custom IDm to use");
PrintAndLogEx(NORMAL, " hf felica rqresponse -i 01100910c11bc407");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -334,7 +335,8 @@ static bool add_param(const char *Cmd, uint8_t paramCount, uint8_t *data, uint8_
param_gethex(Cmd, paramCount, data + dataPosition, length); param_gethex(Cmd, paramCount, data + dataPosition, length);
return true; return true;
} else { } else {
PrintAndLogEx(ERR, "Incorrect Parameter length! Param %i", paramCount); PrintAndLogEx(ERR, "Param %s", Cmd);
PrintAndLogEx(ERR, "Incorrect Parameter length! Param %i should be %i", paramCount, length);
return false; return false;
} }
} }
@ -468,9 +470,11 @@ static int CmdHFFelicaWriteWithoutEncryption(const char *Cmd) {
case 'i': case 'i':
paramCount++; paramCount++;
custom_IDm = true; custom_IDm = true;
if (!add_param(Cmd, paramCount, data, 3, 8)) { if (!add_param(Cmd, paramCount, data, 2, 16)) {
return PM3_EINVARG; return PM3_EINVARG;
} }
paramCount++;
i += 16;
break; break;
} }
} }
@ -530,9 +534,11 @@ static int CmdHFFelicaReadWithoutEncryption(const char *Cmd) {
case 'i': case 'i':
paramCount++; paramCount++;
custom_IDm = true; custom_IDm = true;
if (!add_param(Cmd, paramCount, data, 3, 8)) { if (!add_param(Cmd, paramCount, data, 2, 16)) {
return PM3_EINVARG; return PM3_EINVARG;
} }
paramCount++;
i += 16;
break; break;
case 'b': case 'b':
paramCount++; paramCount++;
@ -624,12 +630,11 @@ static int CmdHFFelicaRequestResponse(const char *Cmd) {
case 'i': case 'i':
paramCount++; paramCount++;
custom_IDm = true; custom_IDm = true;
if (param_getlength(Cmd, paramCount) == 16) { if (!add_param(Cmd, paramCount, data, 2, 16)) {
param_gethex(Cmd, paramCount++, data + 2, 16);
} else {
PrintAndLogEx(ERR, "Incorrect IDm length! IDm must be 8-Byte.");
return PM3_EINVARG; return PM3_EINVARG;
} }
paramCount++;
i+=16;
break; break;
} }
} }
@ -686,13 +691,11 @@ static int CmdHFFelicaRequestService(const char *Cmd) {
case 'i': case 'i':
paramCount++; paramCount++;
custom_IDm = true; custom_IDm = true;
if (param_getlength(Cmd, paramCount) == 16) { if (!add_param(Cmd, paramCount, data, 2, 16)) {
param_gethex(Cmd, paramCount++, data + 2, 16);
} else {
PrintAndLogEx(ERR, "Incorrect IDm length! IDm must be 8-Byte.");
return PM3_EINVARG; return PM3_EINVARG;
} }
i += 8; paramCount++;
i += 16;
break; break;
case 'a': case 'a':
paramCount++; paramCount++;