From e16d7168c54e5f7bc2f0037806ee4f730930eaf0 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 3 Nov 2015 23:15:27 +0100 Subject: gpg: Allow multiple --default-key options. Take the last available key. * g10/getkey.c (parse_def_secret_key): New function. (get_seckey_default): Add parameter ctrl. Update callers. Use parse_def_secret_key to get the default secret key, if any. (getkey_byname): Likewise. (enum_secret_keys): Likewise. * g10/options.h (opt): Change def_secret_key's type from a char * to a strlist_t. * g10/gpg.c (main): When processing --default-key, add the key to OPT.DEF_SECRET_KEY. * g10/gpgv.c (get_session_key): Add parameter ctrl. Update callers. * g10/mainproc.c (proc_pubkey_enc): Likewise. (do_proc_packets): Likewise. * g10/pkclist.c (default_recipient): Likewise. * g10/pubkey-enc.c (get_session_key): Likewise. * g10/sign.c (clearsign_file): Likewise. (sign_symencrypt_file): Likewise. * g10/skclist.c (build_sk_list): Likewise. * g10/test-stubs.c (get_session_key): Likewise. -- Signed-off-by: Neal H. Walield GnuPG-bug-id: 806 --- g10/revoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/revoke.c') diff --git a/g10/revoke.c b/g10/revoke.c index b341ccec1..7ff50be2a 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -248,7 +248,7 @@ gen_desig_revoke (ctrl_t ctrl, const char *uname, strlist_t locusr) if(locusr) { - rc=build_sk_list(locusr, &sk_list, PUBKEY_USAGE_CERT); + rc = build_sk_list (ctrl, locusr, &sk_list, PUBKEY_USAGE_CERT); if(rc) goto leave; } -- cgit v1.2.3