[Pkg-gnupg-commit] [gnupg2] 95/205: sm: Remove unused argument '--fixed-passphrase'.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 53ed98eda77ff2dcf390cebd0cec9f2665661863
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 7 13:32:35 2016 +0100

    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 at g10code.com>
---
 doc/gpgsm.texi | 6 ------
 sm/gpgsm.c     | 3 ---
 sm/gpgsm.h     | 1 -
 3 files changed, 10 deletions(-)

diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 2bcbec5..dc57e4b 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -737,12 +737,6 @@ This is actually not a debugging option but only useful as such.  It
 lets @command{gpgsm} ignore all notAfter dates, this is used by the regression
 tests.
 
- at item --fixed-passphrase @var{string}
- at opindex fixed-passphrase
-Supply the passphrase @var{string} to the gpg-protect-tool.  This
-option is only useful for the regression tests included with this
-package and may be revised or removed at any time without notice.
-
 @item --no-common-certs-import
 @opindex no-common-certs-import
 Suppress the import of common certificates on keybox creation.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index a0b7038..364dd43 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 30e4fb3..44b4798 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. */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git