mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* keyedit.c (sign_uids): Show keyid of the key making the signature.
* trustdb.h, trustdb.c (is_disabled), keylist.c (print_capabilities), gpgv.c (is_disabled): is_disabled now takes a pk and not just the keyid. This is for speed since there is no need to re-fetch a key when we already have that key handy. * getkey.c (skip_disabled): New function to get a pk and call is_disabled on it. (key_byname): Use it here.
This commit is contained in:
parent
879014e14b
commit
53f2944998
7 changed files with 46 additions and 27 deletions
|
@ -315,23 +315,17 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
|
|||
}
|
||||
}
|
||||
|
||||
if ( keyblock ) { /* figure our the usable capabilities */
|
||||
if ( keyblock ) { /* figure out the usable capabilities */
|
||||
KBNODE k;
|
||||
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_primary)
|
||||
disabled=is_disabled(pk);
|
||||
|
||||
if ( pk->is_valid && !pk->is_revoked && !pk->has_expired ) {
|
||||
if ( pk->pubkey_usage & PUBKEY_USAGE_ENC )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue