diff options
| author | Werner Koch <[email protected]> | 2023-03-13 07:49:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-03-13 07:53:50 +0000 |
| commit | 6d792ae2eb46b3c411d36a87f0d08fbfc1b65cc9 (patch) | |
| tree | 9ff0d23657cb62275d932e1aece6b1d2cfa0bb1d /agent/protect-tool.c | |
| parent | dirmngr: Add command "GETINFO stats". (diff) | |
| download | gnupg-6d792ae2eb46b3c411d36a87f0d08fbfc1b65cc9.tar.gz gnupg-6d792ae2eb46b3c411d36a87f0d08fbfc1b65cc9.zip | |
agent: Make --disable-extended-key-format a dummy option.
* agent/agent.h (opt): Remove enable_extended_key_format.
* agent/gpg-agent.c (enum cmd_and_opt_values): Turn
oDisableExtendedKeyFormat and oEnableExtendedKeyFormat into dummy
options.
* agent/protect.c (do_encryption): Remove arg use_ocb and
corresponding code.
(agent_protect): Ditto. Change all callers.
* agent/findkey.c (agent_write_private_key): Simplify due to the
removal of disable-extended-key-format.
(write_extended_private_key): Fold into agent_write_private_key.
--
This change is related to
GnuPG-bug-id: 6386
but should have no visible effect except for the removal of
option --disable-extended-key-format.
Diffstat (limited to 'agent/protect-tool.c')
| -rw-r--r-- | agent/protect-tool.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/agent/protect-tool.c b/agent/protect-tool.c index bb17033a8..87cf36814 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -97,7 +97,6 @@ static const char *opt_passphrase; static char *opt_prompt; static int opt_status_msg; static const char *opt_agent_program; -static int opt_debug_use_ocb; static char *get_passphrase (int promptno); static void release_passphrase (char *pw); @@ -343,8 +342,7 @@ read_and_protect (const char *fname) return; pw = get_passphrase (1); - rc = agent_protect (key, pw, &result, &resultlen, 0, - opt_debug_use_ocb? 1 : -1); + rc = agent_protect (key, pw, &result, &resultlen, 0); release_passphrase (pw); xfree (key); if (rc) @@ -610,7 +608,7 @@ main (int argc, char **argv ) case oHaveCert: opt_have_cert = 1; break; case oPrompt: opt_prompt = pargs.r.ret_str; break; case oStatusMsg: opt_status_msg = 1; break; - case oDebugUseOCB: opt_debug_use_ocb = 1; break; + case oDebugUseOCB: /* dummy */; break; default: pargs.err = ARGPARSE_PRINT_ERROR; break; } |