diff options
| author | Justus Winter <justus@g10code.com> | 2016-03-07 13:32:35 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-03-07 15:22:38 +0100 |
| commit | 53ed98eda77ff2dcf390cebd0cec9f2665661863 (patch) | |
| tree | 7c19ab53a4cb99a8895323bff4031ee99fb14ca3 /sm | |
| parent | kbx: Avoid undefined behavior. (diff) | |
| download | gnupg2-53ed98eda77ff2dcf390cebd0cec9f2665661863.tar.xz gnupg2-53ed98eda77ff2dcf390cebd0cec9f2665661863.zip | |
sm: Remove unused argument '--fixed-passphrase'.
* doc/gpgsm.texi: Drop description.
* sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
(opts): Drop argument.
(main): Drop argument handling.
* sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/gpgsm.c | 3 | ||||
| -rw-r--r-- | sm/gpgsm.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index a0b70388f..364dd43ff 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -99,7 +99,6 @@ enum cmd_and_opt_values { oDebugAllowCoreDump, oDebugNoChainValidation, oDebugIgnoreExpiration, - oFixedPassphrase, oLogFile, oNoLogFile, oAuditLog, @@ -332,7 +331,6 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"), ARGPARSE_s_n (oDebugNoChainValidation, "debug-no-chain-validation", "@"), ARGPARSE_s_n (oDebugIgnoreExpiration, "debug-ignore-expiration", "@"), - ARGPARSE_s_s (oFixedPassphrase, "fixed-passphrase", "@"), ARGPARSE_s_i (oStatusFD, "status-fd", N_("|FD|write status info to this FD")), @@ -1264,7 +1262,6 @@ main ( int argc, char **argv) break; case oDebugNoChainValidation: opt.no_chain_validation = 1; break; case oDebugIgnoreExpiration: opt.ignore_expiration = 1; break; - case oFixedPassphrase: opt.fixed_passphrase = pargs.r.ret_str; break; case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break; case oLoggerFD: log_set_fd (pargs.r.ret_int ); break; diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 30e4fb345..44b4798ff 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -125,7 +125,6 @@ struct int no_policy_check; /* ignore certificate policies */ int no_chain_validation; /* Bypass all cert chain validity tests */ int ignore_expiration; /* Ignore the notAfter validity checks. */ - char *fixed_passphrase; /* Passphrase used by regression tests. */ int auto_issuer_key_retrieve; /* try to retrieve a missing issuer key. */ |