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

* keylist.c (print_capabilities): Secret-parts-missing keys should show

Browse source 
that fact in the capabilities, and only primary signing keys can certify
other keys.

* packet.h, parse_packet.c (parse_key): Add is_primary flag for public
keys (it already exists for secret keys).
This commit is contained in:
David Shaw 2002-10-03 19:20:37 +00:00
parent 58972f24c4
commit fcefffcb00
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
g10/keylist.c
View file

@ -305,9 +305,10 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if ( use & PUBKEY_USAGE_ENC ) {
putchar ('e');
}
if ( use & PUBKEY_USAGE_SIG ) {
if ( (use & PUBKEY_USAGE_SIG) && !(sk?(sk->protect.s2k.mode==1001):0) ) {
putchar ('s');
putchar ('c');
if( pk? pk->is_primary : sk->is_primary )
putchar ('c');
}
if ( keyblock ) { /* figure our the usable capabilities */
KBNODE k;
@ -321,17 +322,26 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
if ( pk->pubkey_usage & PUBKEY_USAGE_ENC )
enc = 1;
if ( pk->pubkey_usage & PUBKEY_USAGE_SIG )
sign = cert = 1;
{
sign = 1;
if(pk->is_primary)
cert = 1;
}
}
}
else if ( k->pkt->pkttype == PKT_SECRET_KEY
|| k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
sk = k->pkt->pkt.secret_key;
if ( sk->is_valid && !sk->is_revoked && !sk->has_expired ) {
if ( sk->is_valid && !sk->is_revoked && !sk->has_expired
&& sk->protect.s2k.mode!=1001 ) {
if ( sk->pubkey_usage & PUBKEY_USAGE_ENC )
enc = 1;
if ( sk->pubkey_usage & PUBKEY_USAGE_SIG )
sign = cert = 1;
{
sign = 1;
if(sk->is_primary)
cert = 1;
}
}
}
}