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

emrtd: Ensure that emrtd_parse_ef_sod_hash_algo returns -1 on errors too

Browse Source
This commit is contained in:
Ave
2020-12-29 19:13:10 +03:00
parent 03be720277
commit d1ec96ed41
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/cmdhfemrtd.c
View File

@@ -1544,6 +1544,9 @@ static int emrtd_parse_ef_sod_hash_algo(uint8_t *data, size_t datalen, int *hash
uint8_t hashalgoset[64] = { 0x00 }; uint8_t hashalgoset[64] = { 0x00 };
size_t hashalgosetlen = 0; size_t hashalgosetlen = 0;
// We'll return hash algo -1 if we can't find anything
*hashalgo = -1;
if (!emrtd_lds_get_data_by_tag(data, datalen, hashalgoset, &hashalgosetlen, 0x30, 0x00, false, true, 0)) { if (!emrtd_lds_get_data_by_tag(data, datalen, hashalgoset, &hashalgosetlen, 0x30, 0x00, false, true, 0)) {
PrintAndLogEx(ERR, "Failed to read hash algo set from EF_SOD."); PrintAndLogEx(ERR, "Failed to read hash algo set from EF_SOD.");
return false; return false;
@@ -1571,8 +1574,6 @@ static int emrtd_parse_ef_sod_hash_algo(uint8_t *data, size_t datalen, int *hash
} }
} }
// Return hash algo -1 if we can't find anything
*hashalgo = -1;
PrintAndLogEx(ERR, "Failed to parse hash list (Unknown algo: %s). Hash verification won't be available.", sprint_hex_inrow(hashalgoset, hashalgosetlen)); PrintAndLogEx(ERR, "Failed to parse hash list (Unknown algo: %s). Hash verification won't be available.", sprint_hex_inrow(hashalgoset, hashalgosetlen));
return PM3_ESOFT; return PM3_ESOFT;
} }