diff options
| author | David Shaw <[email protected]> | 2003-07-21 23:19:15 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-07-21 23:19:15 +0000 |
| commit | fbdee01db968d501d26cf5c2ea21c803815ce1ef (patch) | |
| tree | 96422839217e179100ec53c2acc34c6ad187252c /g10/getkey.c | |
| parent | * keyedit.c (show_key_with_all_names): Use list-option show-validity in (diff) | |
| download | gnupg-fbdee01db968d501d26cf5c2ea21c803815ce1ef.tar.gz gnupg-fbdee01db968d501d26cf5c2ea21c803815ce1ef.zip | |
* 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.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index f488eb04a..e2d2f3446 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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); |