From fbdee01db968d501d26cf5c2ea21c803815ce1ef Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 21 Jul 2003 23:19:15 +0000 Subject: * 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. --- g10/mainproc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'g10/mainproc.c') diff --git a/g10/mainproc.c b/g10/mainproc.c index ea3b82db5..e9a658ead 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -665,7 +665,6 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey ) PKT_signature *sig; MD_HANDLE md = NULL, md2 = NULL; int algo, rc, dum2; - u32 dummy; if(!is_expkey) is_expkey=&dum2; @@ -722,9 +721,9 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey ) } else return G10ERR_SIG_CLASS; - rc = signature_check2( sig, md, &dummy, is_expkey, NULL ); + rc = signature_check2( sig, md, NULL, is_expkey, NULL ); if( rc == G10ERR_BAD_SIGN && md2 ) - rc = signature_check2( sig, md2, &dummy, is_expkey, NULL ); + rc = signature_check2( sig, md2, NULL, is_expkey, NULL ); md_close(md); md_close(md2); -- cgit v1.2.3