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/agent.h | |
| 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/agent.h')
| -rw-r--r-- | agent/agent.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/agent/agent.h b/agent/agent.h index 303f92e50..4e7452eee 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -141,13 +141,6 @@ struct passphrase change. */ int enable_passphrase_history; - /* If set the extended key format is used for new keys. Note that - * this may have the value 2 in which case - * --disable-extended-key-format won't have any effect and thus - * effectivley locking it. This is required to support existing - * profiles which lock the use of --enable-extended-key-format. */ - int enable_extended_key_format; - int running_detached; /* We are running detached from the tty. */ /* If this global option is true, the passphrase cache is ignored @@ -566,7 +559,7 @@ unsigned char get_standard_s2k_count_rfc4880 (void); unsigned long get_standard_s2k_time (void); int agent_protect (const unsigned char *plainkey, const char *passphrase, unsigned char **result, size_t *resultlen, - unsigned long s2k_count, int use_ocb); + unsigned long s2k_count); gpg_error_t agent_unprotect (ctrl_t ctrl, const unsigned char *protectedkey, const char *passphrase, gnupg_isotime_t protected_at, |