mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keygen.c (do_add_key_flags): Don't set the certify flag for subkeys.
(ask_algo): Provide key flags for DSA, Elgamal_e, and Elgamal subkeys. (generate_keypair): Provide key flags for the default DSA/Elgamal keys. * sig-check.c (signature_check, signature_check2, check_key_signature, check_key_signature2): Allow passing NULLs for unused parameters in the x2 form of each function to avoid the need for dummy variables. getkey.c, mainproc.c: Change all callers. * trustdb.h, trustdb.c (read_trust_options): New. Returns items from the trustdb version record. * keylist.c (public_key_list): Use it here for the new "tru" record. * gpgv.c (read_trust_options): Stub.
This commit is contained in:
parent
fa0cc6602b
commit
fbdee01db9
9 changed files with 129 additions and 29 deletions
|
@ -1587,8 +1587,6 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
else if ( k->pkt->pkttype == PKT_SIGNATURE && uidnode )
|
||||
{
|
||||
PKT_signature *sig = k->pkt->pkt.signature;
|
||||
u32 dummy;
|
||||
int dum2;
|
||||
|
||||
if(sig->keyid[0] != kid[0] || sig->keyid[1]!=kid[1])
|
||||
{
|
||||
|
@ -1604,7 +1602,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
ultimate trust flag. */
|
||||
if(get_pubkey_fast(ultimate_pk,sig->keyid)==0
|
||||
&& check_key_signature2(keyblock,k,ultimate_pk,
|
||||
NULL,NULL,&dummy,&dum2)==0
|
||||
NULL,NULL,NULL,NULL)==0
|
||||
&& get_ownertrust(ultimate_pk)==TRUST_ULTIMATE)
|
||||
{
|
||||
free_public_key(ultimate_pk);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue