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

fix object strings. Integers is now 64b which isnt enough. Will need to use big_num here

Browse source
This commit is contained in:
iceman1001 2023-03-12 18:59:53 +01:00
commit 4a7713070b
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/crypto/asn1dump.c
View file

@ -96,7 +96,6 @@ static const struct asn1_tag asn1_tags[] = {
{ 0xa5, "[5]", ASN1_TAG_GENERIC }, { 0xa5, "[5]", ASN1_TAG_GENERIC },
}; };
static int asn1_sort_tag(tlv_tag_t tag) { static int asn1_sort_tag(tlv_tag_t tag) {
return (int)(tag >= 0x100 ? tag : tag << 8); return (int)(tag >= 0x100 ? tag : tag << 8);
} }
@ -109,9 +108,7 @@ static int asn1_tlv_compare(const void *a, const void *b) {
} }
static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) { static const struct asn1_tag *asn1_get_tag(const struct tlv *tlv) {
struct asn1_tag *tag = bsearch(tlv, asn1_tags, ARRAYLEN(asn1_tags), struct asn1_tag *tag = bsearch(tlv, asn1_tags, ARRAYLEN(asn1_tags), sizeof(asn1_tags[0]), asn1_tlv_compare);
sizeof(asn1_tags[0]), asn1_tlv_compare);
return tag ? tag : &asn1_tags[0]; return tag ? tag : &asn1_tags[0];
} }
@ -189,8 +186,8 @@ static void asn1_tag_dump_octet_string(const struct tlv *tlv, const struct asn1_
} }
} }
static unsigned long asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) { static uint64_t asn1_value_integer(const struct tlv *tlv, unsigned start, unsigned end) {
unsigned long ret = 0; uint64_t ret = 0;
unsigned i; unsigned i;
if (end > tlv->len * 2) if (end > tlv->len * 2)
@ -238,8 +235,8 @@ static void asn1_tag_dump_integer(const struct tlv *tlv, const struct asn1_tag *
PrintAndLogEx(NORMAL, " value: %d (0x%08X)", val, val); PrintAndLogEx(NORMAL, " value: %d (0x%08X)", val, val);
return; return;
} }
uint32_t val = asn1_value_integer(tlv, 0, tlv->len * 2); uint64_t val = asn1_value_integer(tlv, 0, tlv->len * 2);
PrintAndLogEx(NORMAL, " value: %" PRIu32 " (0x%X)", val, val); PrintAndLogEx(NORMAL, " value: %" PRIu64 " (0x%X)", val, val);
} }
static char *asn1_oid_description(const char *oid, bool with_group_desc) { static char *asn1_oid_description(const char *oid, bool with_group_desc) {
@ -293,7 +290,7 @@ static void asn1_tag_dump_object_id(const struct tlv *tlv, const struct asn1_tag
char pstr[300]; char pstr[300];
mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf); mbedtls_oid_get_numeric_string(pstr, sizeof(pstr), &asn1_buf);
PrintAndLogEx(INFO, "%*s %s" NOLF, (level * 4), " ", pstr); PrintAndLogEx(NORMAL, "%*s %s" NOLF, (level * 4), " ", pstr);
char *jsondesc = asn1_oid_description(pstr, true); char *jsondesc = asn1_oid_description(pstr, true);
if (jsondesc) { if (jsondesc) {