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

asn.1 description from json works

Browse source
This commit is contained in:
merlokk 2018-11-15 17:15:37 +02:00
commit 638890cb6a
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/crypto/asn1dump.c
View file

@ -11,6 +11,8 @@
#include "asn1dump.h" #include "asn1dump.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <jansson.h> #include <jansson.h>
#include <mbedtls/asn1.h> #include <mbedtls/asn1.h>
#include <mbedtls/oid.h> #include <mbedtls/oid.h>
@ -18,6 +20,7 @@
#include "emv/dump.h" #include "emv/dump.h"
#include "emv/emvjson.h" #include "emv/emvjson.h"
#include "util.h" #include "util.h"
#include "proxmark3.h"
#define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, " ");} #define PRINT_INDENT(level) {for (int i = 0; i < (level); i++) fprintf(f, " ");}
@ -217,26 +220,22 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
} }
static char *asn1_oid_description(const char *oid, bool with_group_desc) { static char *asn1_oid_description(const char *oid, bool with_group_desc) {
json_error_t error;
char fname[300] = {0};
static char res[300]; static char res[300];
memset(res, 0x00, sizeof(res)); memset(res, 0x00, sizeof(res));
/* strcpy(fname, get_my_executable_directory());
strcat(fname, "crypto/oids.json");
if (access(fname, F_OK) < 0) {
strcpy(fname, get_my_executable_directory()); strcpy(fname, get_my_executable_directory());
strcat(fname, cjsonname); strcat(fname, "oids.json");
if (access(fname, F_OK) != -1) { if (access(fname, F_OK) < 0) {
root = json_load_file(fname, 0, &error); goto error; // file not found
if (!root) { }
PrintAndLog("ERROR: json error on line %d: %s", error.line, error.text); }
*err = true;
return NULL;
}
*/ // load `oids.json`
json_error_t error;
char fname[] = "crypto/oids.json";
json_t *root = json_load_file(fname, 0, &error); json_t *root = json_load_file(fname, 0, &error);
if (!root || !json_is_object(root)) { if (!root || !json_is_object(root)) {