security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* keylist.c (print_capabilities): Show 'D' for disabled keys in

Browse source 
capabilities section.

* trustdb.c (is_disabled): Remove incorrect comment.
This commit is contained in:
David Shaw 2003-01-06 21:06:47 +00:00
parent 2d5091e4e3
commit fad1d22621
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/keylist.c
View file

@ -317,12 +317,22 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if ( keyblock ) { /* figure our the usable capabilities */
KBNODE k;
int enc=0, sign=0, cert=0;
int enc=0, sign=0, cert=0, disabled=0;
for (k=keyblock; k; k = k->next ) {
if ( k->pkt->pkttype == PKT_PUBLIC_KEY
|| k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
u32 kid[2];
pk = k->pkt->pkt.public_key;
if(k->pkt->pkttype==PKT_PUBLIC_KEY)
{
keyid_from_pk(pk,kid);
if(is_disabled(NULL,kid))
disabled=1;
}
if ( pk->is_valid && !pk->is_revoked && !pk->has_expired ) {
if ( pk->pubkey_usage & PUBKEY_USAGE_ENC )
enc = 1;
@ -356,7 +366,10 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
putchar ('S');
if (cert)
putchar ('C');
if (disabled)
putchar ('D');
}
putchar(':');
}