diff options
| author | Werner Koch <[email protected]> | 2019-08-21 08:19:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-08-21 08:19:16 +0000 |
| commit | c185f6dfbd1bfd809369da789239a371e9d1610e (patch) | |
| tree | f26a2a500e5e3b3a329b61a90977edd0abdffc14 | |
| parent | gpg: Prepare card code to allow other than OpenPGP cards. (diff) | |
| download | gnupg-c185f6dfbd1bfd809369da789239a371e9d1610e.tar.gz gnupg-c185f6dfbd1bfd809369da789239a371e9d1610e.zip | |
gpg: New option --use-only-openpgp-card
* g10/gpg.c (opts): Add option.
(main): Set flag.
* g10/options.h: Add flags.use_only_openpgp_card.
* g10/call-agent.c (start_agent): Implement option.
--
With the previous patch we switch to autoselect an application
instead of requesting an openpgp card. This option allows to revert
this in case of use use cases which expected the former behaviour.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | g10/call-agent.c | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 9 | ||||
| -rw-r--r-- | g10/options.h | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c index 9c2a3f315..a7991baf8 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -336,7 +336,9 @@ start_agent (ctrl_t ctrl, int flag_for_card) if (!(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS)) rc = warn_version_mismatch (agent_ctx, SCDAEMON_NAME, 2); if (!rc) - rc = assuan_transact (agent_ctx, "SCD SERIALNO", + rc = assuan_transact (agent_ctx, + opt.flags.use_only_openpgp_card? + "SCD SERIALNO openpgp" : "SCD SERIALNO", NULL, NULL, NULL, NULL, learn_status_cb, &info); if (rc && !(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS)) @@ -422,6 +422,7 @@ enum cmd_and_opt_values oKeyOrigin, oRequestOrigin, oNoSymkeyCache, + oUseOnlyOpenPGPCard, oNoop }; @@ -887,6 +888,10 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"), ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"), + /* Options which can be used in special circumstances. They are not + * published and we hope they are never required. */ + ARGPARSE_s_n (oUseOnlyOpenPGPCard, "use-only-openpgp-card", "@"), + /* Dummy options with warnings. */ ARGPARSE_s_n (oUseAgent, "use-agent", "@"), ARGPARSE_s_n (oNoUseAgent, "no-use-agent", "@"), @@ -3576,6 +3581,10 @@ main (int argc, char **argv) opt.def_new_key_algo = pargs.r.ret_str; break; + case oUseOnlyOpenPGPCard: + opt.flags.use_only_openpgp_card = 1; + break; + case oNoop: break; default: diff --git a/g10/options.h b/g10/options.h index 0f007c16c..994c1b241 100644 --- a/g10/options.h +++ b/g10/options.h @@ -243,6 +243,9 @@ struct unsigned int rfc4880bis:1; /* Hack: --output is not given but OUTFILE was temporary set to "-". */ unsigned int dummy_outfile:1; + /* Force the use of the OpenPGP card and do not allow the use of + * another card. */ + unsigned int use_only_openpgp_card:1; } flags; /* Linked list of ways to find a key if the key isn't on the local |