mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
g10: Fix default-key selection for signing, possibly by card.
* g10/call-agent.c (warn_version_mismatch): Revert. (start_agent): Suppress version mismatch if relevant. * g10/getkey.c (get_seckey_default_or_card): New. * g10/skclist.c (build_sk_list): Use get_seckey_default_or_card. -- The change of97a2394
, which prefers available card than default key specified is too strong. Fixes-commit:97a2394eca
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
3713f67026
commit
fbb2259d22
4 changed files with 62 additions and 16 deletions
|
@ -351,6 +351,8 @@ const char *parse_def_secret_key (ctrl_t ctrl);
|
|||
|
||||
/* Look up a secret key. */
|
||||
gpg_error_t get_seckey_default (ctrl_t ctrl, PKT_public_key *pk);
|
||||
gpg_error_t get_seckey_default_or_card (ctrl_t ctrl, PKT_public_key *pk,
|
||||
const byte *fpr, size_t fpr_len);
|
||||
|
||||
/* Search for keys matching some criteria. */
|
||||
gpg_error_t getkey_bynames (ctrl_t ctrl,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue