From be7f0281e14ed9567f0e68054d11a14b9e9ed511 Mon Sep 17 00:00:00 2001 From: jhigh Date: Wed, 28 Jul 2021 22:31:45 +0000 Subject: [PATCH] print Issuer Fingerprint subpacket 33 (rfc4880bis-08:5.2.3.28) rather than Unknown --- crypto/external/bsd/netpgp/dist/src/lib/packet-print.c | 10 +++++++++- crypto/external/bsd/netpgp/dist/src/lib/packet-show.c | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c b/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c index da9b26c1b59c..702b90ccd2fc 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c +++ b/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c @@ -58,7 +58,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: packet-print.c,v 1.42 2012/02/22 06:29:40 agc Exp $"); +__RCSID("$NetBSD: packet-print.c,v 1.43 2021/07/28 22:31:45 jhigh Exp $"); #endif #include @@ -1090,6 +1090,14 @@ pgp_print_packet(pgp_printstate_t *print, const pgp_packet_t *pkt) end_subpacket(&print->indent); break; + case PGP_PTAG_SS_ISSUER_FINGERPRINT: + start_subpacket(&print->indent, pkt->tag); + print_hexdump(print->indent, "Issuer Fingerprint", + content->ss_issuer_fingerprint.fingerprint, + content->ss_issuer_fingerprint.len); + end_subpacket(&print->indent); + break; + case PGP_PTAG_SS_PREFERRED_SKA: start_subpacket(&print->indent, pkt->tag); print_data(print->indent, "Preferred Symmetric Algorithms", diff --git a/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c b/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c index e08c6876c4ed..d21043a7f9e6 100644 --- a/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c +++ b/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c @@ -60,7 +60,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: packet-show.c,v 1.21 2011/08/14 11:19:51 christos Exp $"); +__RCSID("$NetBSD: packet-show.c,v 1.22 2021/07/28 22:31:45 jhigh Exp $"); #endif #include @@ -115,6 +115,7 @@ static pgp_map_t packet_tag_map[] = {PGP_PTAG_SS_PREFERRED_SKA, "SS: Preferred Secret Key Algorithm"}, {PGP_PTAG_SS_REVOCATION_KEY, "SS: Revocation Key"}, {PGP_PTAG_SS_ISSUER_KEY_ID, "SS: Issuer Key Id"}, + {PGP_PTAG_SS_ISSUER_FINGERPRINT, "SS: Issuer Fingerprint"}, {PGP_PTAG_SS_NOTATION_DATA, "SS: Notation Data"}, {PGP_PTAG_SS_PREFERRED_HASH, "SS: Preferred Hash Algorithm"}, {PGP_PTAG_SS_PREF_COMPRESS, "SS: Preferred Compression Algorithm"}, @@ -164,6 +165,7 @@ static pgp_map_t ss_type_map[] = {PGP_PTAG_SS_PREFERRED_SKA, "Preferred Symmetric Algorithms"}, {PGP_PTAG_SS_REVOCATION_KEY, "Revocation Key"}, {PGP_PTAG_SS_ISSUER_KEY_ID, "Issuer key ID"}, + {PGP_PTAG_SS_ISSUER_FINGERPRINT, "Issuer Fingerprint"}, {PGP_PTAG_SS_NOTATION_DATA, "Notation Data"}, {PGP_PTAG_SS_PREFERRED_HASH, "Preferred Hash Algorithms"}, {PGP_PTAG_SS_PREF_COMPRESS, "Preferred Compression Algorithms"},