security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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

capabilities section.

* trustdb.c (is_disabled): Remove incorrect comment.
This commit is contained in:
David Shaw 2003-01-06 21:01:44 +00:00
parent e247a0b3e0
commit c974390d37
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2003-01-06 David Shaw <dshaw@jabberwocky.com>
* keylist.c (print_capabilities): Show 'D' for disabled keys in
capabilities section.
* trustdb.c (is_disabled): Remove incorrect comment.
2003-01-03 David Shaw <dshaw@jabberwocky.com>
* import.c (import_one): Only do the work to create the status

15
g10/keylist.c
View File

@ -359,12 +359,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;
@ -398,7 +408,10 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
putchar ('S');
if (cert)
putchar ('C');
if (disabled)
putchar ('D');
}
putchar(':');
}

2
g10/trustdb.c
View File

@ -904,8 +904,6 @@ is_disabled(void *dummy,u32 *keyid)
init_trustdb ();
/* Note that get_pubkey returns the main key if keyid points to a
subkey. That's a good thing here. */
rc = get_pubkey(pk, keyid);
if(rc)
{