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/genkey.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/genkey.c')
| -rw-r--r-- | agent/genkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/genkey.c b/agent/genkey.c index eb6791dca..7660443ca 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -57,7 +57,7 @@ store_key (gcry_sexp_t private, const char *passphrase, int force, { unsigned char *p; - rc = agent_protect (buf, passphrase, &p, &len, s2k_count, -1); + rc = agent_protect (buf, passphrase, &p, &len, s2k_count); if (rc) { xfree (buf); |