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

load json OK

Browse source
This commit is contained in:
merlokk 2018-11-20 19:31:08 +02:00
commit ea3472b0e0
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/cmdhffido.c
View file

@ -720,15 +720,19 @@ int CmdHFFidoAuthenticate(const char *cmd) {
return 0; return 0;
}; };
void CheckSlash(char *fileName) {
if ((fileName[strlen(fileName) - 1] != '/') &&
(fileName[strlen(fileName) - 1] != '\\'))
strcat(fileName, "/");
}
int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) { int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileName) {
fileName[0] = 0x00; fileName[0] = 0x00;
strcpy(fileName, get_my_executable_directory()); strcpy(fileName, get_my_executable_directory());
if (fileName[strlen(fileName) - 1] != '/') CheckSlash(fileName);
strcat(fileName, "/");
strcat(fileName, prefixDir); strcat(fileName, prefixDir);
if (fileName[strlen(fileName) - 1] != '/') CheckSlash(fileName);
strcat(fileName, "/");
strcat(fileName, reqestedFileName); strcat(fileName, reqestedFileName);
if (!strstr(fileName, ".json")) if (!strstr(fileName, ".json"))
@ -736,8 +740,7 @@ int GetExistsFileNameJson(char *prefixDir, char *reqestedFileName, char *fileNam
if (access(fileName, F_OK) < 0) { if (access(fileName, F_OK) < 0) {
strcpy(fileName, get_my_executable_directory()); strcpy(fileName, get_my_executable_directory());
if (fileName[strlen(fileName) - 1] != '/') CheckSlash(fileName);
strcat(fileName, "/");
strcat(fileName, reqestedFileName); strcat(fileName, reqestedFileName);
if (!strstr(fileName, ".json")) if (!strstr(fileName, ".json"))
@ -758,10 +761,16 @@ int CmdHFFido2MakeCredential(const char *cmd) {
char fname[300] = {0}; char fname[300] = {0};
int res = GetExistsFileNameJson("fido", "fido2", fname); int res = GetExistsFileNameJson("fido", "fido2", fname);
if(res) if(res) {
PrintAndLog("ERROR: Can't found json file.");
return res; return res;
}
PrintAndLog("fname: %s\n", fname);
root = json_load_file(fname, 0, &error); root = json_load_file(fname, 0, &error);
if (!root) {
PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text);
return 1;
}
uint8_t data[2048] = {0}; uint8_t data[2048] = {0};
size_t datalen = 0; size_t datalen = 0;