security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

sm: Also show the SHA-256 fingerprint.

Browse Source 
* sm/keylist.c (list_cert_colon): Emit a new "fp2" record.
(list_cert_raw): Print the SHA2 fingerprint.
(list_cert_std): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-08-04 11:03:49 +02:00
parent 8e04cf969e
commit e7d7092390
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/DETAILS
View File

@ -61,6 +61,7 @@ described here.
- rev :: Revocation signature - rev :: Revocation signature
- rvs :: Revocation signature (standalone) [since 2.2.9] - rvs :: Revocation signature (standalone) [since 2.2.9]
- fpr :: Fingerprint (fingerprint is in field 10) - fpr :: Fingerprint (fingerprint is in field 10)
- fp2 :: SHA-256 fingerprint (fingerprint is in field 10)
- pkd :: Public key data [*] - pkd :: Public key data [*]
- grp :: Keygrip - grp :: Keygrip
- rvk :: Revocation key - rvk :: Revocation key
@ -168,8 +169,8 @@ described here.
(the colon is quoted =\x3a=). For a "pub" record this field is (the colon is quoted =\x3a=). For a "pub" record this field is
not used on --fixed-list-mode. A UAT record puts the attribute not used on --fixed-list-mode. A UAT record puts the attribute
subpacket count here, a space, and then the total attribute subpacket count here, a space, and then the total attribute
subpacket size. In gpgsm the issuer name comes here. A FPR subpacket size. In gpgsm the issuer name comes here. The FPR and FP2
record stores the fingerprint here. The fingerprint of a records store the fingerprints here. The fingerprint of a
revocation key is stored here. revocation key is stored here.
*** Field 11 - Signature class *** Field 11 - Signature class

14
sm/keylist.c
View File

@ -599,6 +599,10 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
es_putc ('\n', fp); es_putc ('\n', fp);
xfree (fpr); fpr = NULL; chain_id = NULL; xfree (fpr); fpr = NULL; chain_id = NULL;
xfree (chain_id_buffer); chain_id_buffer = 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. */ /* Always print the keygrip. */
if ( (p = gpgsm_get_keygrip_hexstring (cert))) if ( (p = gpgsm_get_keygrip_hexstring (cert)))
@ -814,6 +818,10 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
es_putc ('\n', fp); 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); dn = gpgsm_get_fingerprint_string (cert, 0);
es_fprintf (fp, " sha1_fpr: %s\n", dn?dn:"error"); es_fprintf (fp, " sha1_fpr: %s\n", dn?dn:"error");
xfree (dn); 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); 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); xfree (dn);
if (opt.with_keygrip) if (opt.with_keygrip)