aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index a9d248dec..4bb8ef664 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -366,6 +366,10 @@ enum cmd_and_opt_values
oKeyidFormat,
oExitOnStatusWriteError,
oLimitCardInsertTries,
+ oReaderPort,
+ octapiDriver,
+ opcscDriver,
+ oDisableCCID,
oRequireCrossCert,
oNoRequireCrossCert,
oAutoKeyLocate,
@@ -788,6 +792,12 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate", "@"),
ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
+ /* Dummy options with warnings. */
+ ARGPARSE_s_s (oReaderPort, "reader-port", "@"),
+ ARGPARSE_s_s (octapiDriver, "ctapi-driver", "@"),
+ ARGPARSE_s_s (opcscDriver, "pcsc-driver", "@"),
+ ARGPARSE_s_n (oDisableCCID, "disable-ccid", "@"),
+
/* Dummy options. */
ARGPARSE_s_n (oNoop, "sk-comments", "@"),
ARGPARSE_s_n (oNoop, "no-sk-comments", "@"),
@@ -2351,6 +2361,23 @@ main (int argc, char **argv)
obsolete_option (configname, configlineno, "--gpg-agent-info");
break;
+ case oReaderPort:
+ obsolete_scdaemon_option (configname, configlineno,
+ "--reader-port");
+ break;
+ case octapiDriver:
+ obsolete_scdaemon_option (configname, configlineno,
+ "--ctapi-driver");
+ break;
+ case opcscDriver:
+ obsolete_scdaemon_option (configname, configlineno,
+ "--pcsc-driver");
+ break;
+ case oDisableCCID:
+ obsolete_scdaemon_option (configname, configlineno,
+ "--disable-ccid");
+ break;
+
case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;