diff options
| -rw-r--r-- | doc/DETAILS | 5 | ||||
| -rw-r--r-- | sm/keylist.c | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index 4c1fcfa50..0a1282d91 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -61,6 +61,7 @@ described here. - rev :: Revocation signature - rvs :: Revocation signature (standalone) [since 2.2.9] - fpr :: Fingerprint (fingerprint is in field 10) + - fp2 :: SHA-256 fingerprint (fingerprint is in field 10) - pkd :: Public key data [*] - grp :: Keygrip - rvk :: Revocation key @@ -168,8 +169,8 @@ described here. (the colon is quoted =\x3a=). For a "pub" record this field is not used on --fixed-list-mode. A UAT record puts the attribute subpacket count here, a space, and then the total attribute - subpacket size. In gpgsm the issuer name comes here. A FPR - record stores the fingerprint here. The fingerprint of a + subpacket size. In gpgsm the issuer name comes here. The FPR and FP2 + records store the fingerprints here. The fingerprint of a revocation key is stored here. *** Field 11 - Signature class diff --git a/sm/keylist.c b/sm/keylist.c index 1a47be084..fdfee6772 100644 --- a/sm/keylist.c +++ b/sm/keylist.c @@ -599,6 +599,10 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity, es_putc ('\n', fp); xfree (fpr); fpr = NULL; chain_id = NULL; xfree (chain_id_buffer); chain_id_buffer = NULL; + /* SHA256 FPR record */ + fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA256); + es_fprintf (fp, "fp2:::::::::%s::::\n", fpr); + xfree (fpr); fpr = NULL; /* Always print the keygrip. */ if ( (p = gpgsm_get_keygrip_hexstring (cert))) @@ -814,6 +818,10 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd, es_putc ('\n', fp); } + dn = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA256); + es_fprintf (fp, " sha2_fpr: %s\n", dn?dn:"error"); + xfree (dn); + dn = gpgsm_get_fingerprint_string (cert, 0); es_fprintf (fp, " sha1_fpr: %s\n", dn?dn:"error"); xfree (dn); @@ -1330,7 +1338,11 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret, } dn = gpgsm_get_fingerprint_string (cert, 0); - es_fprintf (fp, " fingerprint: %s\n", dn?dn:"error"); + es_fprintf (fp, " sha1 fpr: %s\n", dn?dn:"error"); + xfree (dn); + + dn = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA256); + es_fprintf (fp, " sha2 fpr: %s\n", dn?dn:"error"); xfree (dn); if (opt.with_keygrip) |