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

Fix bug#998.

Browse source
This commit is contained in:
Werner Koch 2009-02-09 11:09:57 +00:00
parent d1c2e66fbc
commit 02890eedd8
4 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/keylist.c
View file

@ -594,6 +594,7 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if(pk || (sk && sk->protect.s2k.mode!=1001))
{
unsigned int use = pk? pk->pubkey_usage : sk->pubkey_usage;
int c_printed = 0;
if ( use & PUBKEY_USAGE_ENC )
putchar ('e');
@ -602,9 +603,19 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
{
putchar ('s');
if( pk? pk->is_primary : sk->is_primary )
putchar ('c');
{
putchar ('c');
/* The PUBKEY_USAGE_CERT flag was introduced later and
we used to always print 'c' for a primary key. To
avoid any regression here we better track whether we
printed 'c' already. */
c_printed = 1;
}
}
if ( (use & PUBKEY_USAGE_CERT) && !c_printed )
putchar ('c');
if ( (use & PUBKEY_USAGE_AUTH) )
putchar ('a');
}
@ -630,6 +641,8 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if(pk->is_primary)
cert = 1;
}
if ( pk->pubkey_usage & PUBKEY_USAGE_CERT )
cert = 1;
if ( (pk->pubkey_usage & PUBKEY_USAGE_AUTH) )
auth = 1;
}
@ -647,6 +660,8 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if(sk->is_primary)
cert = 1;
}
if ( (sk->pubkey_usage & PUBKEY_USAGE_CERT) )
cert = 1;
if ( (sk->pubkey_usage & PUBKEY_USAGE_AUTH) )
auth = 1;
}