From 255d4d5815d00f8d1b45d93cc617c49d375e891b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 9 Sep 2021 13:09:59 +0200 Subject: [PATCH] sm: Add LotW support to the key listing * sm/certdump.c (parse_dn_part): Translate OID to "Callsign" * sm/keylist.c (oidtranstbl): Some more OIDs. -- This is Ham thingy to make it easier to read LotW certificates. Signed-off-by: Werner Koch --- scd/app-p15.c | 4 ++-- sm/certdump.c | 3 ++- sm/keylist.c | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scd/app-p15.c b/scd/app-p15.c index db452361c..4577fbc36 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -325,7 +325,7 @@ struct prkdf_object_s char *serial_number; /* KDF/KEK parameter for OpenPGP's ECDH. First byte is zero if not - * availabale. .*/ + * available. .*/ unsigned char ecdh_kdf[4]; /* Length and allocated buffer with the Id of this object. */ @@ -4455,7 +4455,7 @@ send_key_fpr_line (ctrl_t ctrl, int number, const unsigned char *fpr) } -/* If possible Emit a FPR-KEY status line for the private key object +/* If possible emit a FPR-KEY status line for the private key object * PRKDF using NUMBER as index. */ static void send_key_fpr (app_t app, ctrl_t ctrl, prkdf_object_t prkdf, int number) diff --git a/sm/certdump.c b/sm/certdump.c index 5c9f8a96b..3ad0edbe3 100644 --- a/sm/certdump.c +++ b/sm/certdump.c @@ -385,7 +385,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string) const char *oid; } label_map[] = { /* Warning: When adding new labels, make sure that the buffer - below we be allocated large enough. */ + array->key will be allocated large enough. */ {"EMail", "1.2.840.113549.1.9.1" }, {"T", "2.5.4.12" }, {"GN", "2.5.4.42" }, @@ -397,6 +397,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string) {"PostalCode", "2.5.4.17" }, {"Pseudo", "2.5.4.65" }, {"SerialNumber", "2.5.4.5" }, + {"Callsign", "1.3.6.1.4.1.12348.1.1"}, {NULL, NULL} }; const unsigned char *s, *s1; diff --git a/sm/keylist.c b/sm/keylist.c index f571ee2b5..08b2dc816 100644 --- a/sm/keylist.c +++ b/sm/keylist.c @@ -213,6 +213,13 @@ static struct { "1.2.840.113583.1.1.5", "pdfAuthenticDocumentsTrust", OID_FLAG_KP }, { "1.3.6.1.4.1.6449.1.3.5.2", "comodoCertifiedDeliveryService", OID_FLAG_KP }, + /* ARRL */ + { "1.3.6.1.4.1.12348.1.1", "lotw-callsign" }, + { "1.3.6.1.4.1.12348.1.2", "lotw-qso-first-date" }, + { "1.3.6.1.4.1.12348.1.3", "lotw-qso-end-date" }, + { "1.3.6.1.4.1.12348.1.4", "lotw-dxcc-entity" }, + /* { "1.3.6.1.4.1.12348.1.5", "lotw-fixme" }, */ + { NULL } };