g10: Fix default-key selection for signing, possibly by card.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 22 May 2017 00:27:36 +0000 (09:27 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 22 May 2017 00:27:36 +0000 (09:27 +0900)
commitfbb2259d22e6c6eadc2af722bdc52922da348677
treea834cd489634927a31f5aa12d5ec1f089e562a95
parent3713f67026467f63f80649c92ac4cc7973589855
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 of 97a2394, which prefers available card than default key
specified is too strong.

Fixes-commit: 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
g10/call-agent.c
g10/getkey.c
g10/keydb.h
g10/skclist.c