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

fix asn1 parsing of dates

Browse source
This commit is contained in:
iceman1001 2023-03-19 12:47:24 +01:00
commit 69e43b362e
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,12 +123,20 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
if (len > 4) {
PrintAndLogEx(NORMAL, " value: '" NOLF);
while (true) {
// year
if (longyear == false)
PrintAndLogEx(NORMAL, "20" NOLF);
if (longyear == false) {
int short_year = (tlv->value[0] - '0') * 10 + (tlv->value[1] - '0');
if (short_year >= 0 && short_year <= 99) {
if (short_year > 50) {
PrintAndLogEx(NORMAL, "19" NOLF);
} else {
PrintAndLogEx(NORMAL, "20" NOLF);
}
}
}
PrintAndLogEx(NORMAL, "%.*s-" NOLF, startidx, tlv->value);
if (len < startidx + 2)
break;
@ -154,11 +162,11 @@ static void asn1_tag_dump_str_time(const struct tlv *tlv, const struct asn1_tag
// sec
PrintAndLogEx(NORMAL, "%.*s" NOLF, 2, tlv->value + startidx + 8);
if (len < startidx + 11)
if (len < startidx + 12)
break;
// time zone
PrintAndLogEx(NORMAL, " zone: %.*s" NOLF, len - 10 - (longyear ? 4 : 2), tlv->value + startidx + 10);
PrintAndLogEx(NORMAL, " zone: %.*s" NOLF, len - startidx - 10, tlv->value + startidx + 10);
break;
}
PrintAndLogEx(NORMAL, "'");