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

add dictionary search check hex

Browse source
This commit is contained in:
merlokk 2019-12-01 00:36:28 +02:00
commit a6a16cfd0c
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/fileutils.c
View file

@ -789,10 +789,17 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
if (line[0] == '#')
continue;
if (!isxdigit(line[0])) {
PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_("%2d") "HEX symbols", line, keylen);
continue;
bool searchFail = false;
for (int i = 0; i < keylen; i++) {
if (!isxdigit(line[i])) {
PrintAndLogEx(FAILED, "file content error (pos %d). '%s' must include " _BLUE_("%2d") "HEX symbols", i + 1, line, keylen);
searchFail = true;
break;
}
}
if (searchFail)
continue;
uint64_t key = strtoull(line, NULL, 16);
@ -880,10 +887,16 @@ int loadFileDICTIONARY_safe(const char *preferredName, void **pdata, uint8_t key
if (line[0] == '#')
continue;
if (!isxdigit(line[0])) {
PrintAndLogEx(FAILED, "file content error. '%s' must include " _BLUE_("%2d") "HEX symbols", line, keylen);
continue;
bool searchFail = false;
for (int i = 0; i < keylen; i++) {
if (!isxdigit(line[i])) {
PrintAndLogEx(FAILED, "file content error (pos %d). '%s' must include " _BLUE_("%2d") "HEX symbols", i + 1, line, keylen);
searchFail = true;
break;
}
}
if (searchFail)
continue;
uint64_t key = strtoull(line, NULL, 16);