diff options
| author | Werner Koch <wk@gnupg.org> | 2023-03-13 08:49:49 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2023-03-13 08:53:50 +0100 |
| commit | 6d792ae2eb46b3c411d36a87f0d08fbfc1b65cc9 (patch) | |
| tree | 9ff0d23657cb62275d932e1aece6b1d2cfa0bb1d /agent/cvt-openpgp.c | |
| parent | dirmngr: Add command "GETINFO stats". (diff) | |
| download | gnupg2-6d792ae2eb46b3c411d36a87f0d08fbfc1b65cc9.tar.xz gnupg2-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/cvt-openpgp.c')
| -rw-r--r-- | agent/cvt-openpgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c index d170fdedc..9bb815ff8 100644 --- a/agent/cvt-openpgp.c +++ b/agent/cvt-openpgp.c @@ -1146,7 +1146,7 @@ convert_from_openpgp_native (ctrl_t ctrl, if (!agent_protect (*r_key, passphrase, &protectedkey, &protectedkeylen, - ctrl->s2k_count, -1)) + ctrl->s2k_count)) agent_write_private_key (grip, protectedkey, protectedkeylen, 1, NULL, NULL, 0); xfree (protectedkey); |