diff options
| author | Werner Koch <wk@gnupg.org> | 2019-03-06 17:58:39 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-03-06 17:58:39 +0100 |
| commit | 91ae3e7fb66271691f6fe507262a62fc7e2663a3 (patch) | |
| tree | afc8a348aa4a1441c4a5b43b470e2e239346f947 /agent/protect.c | |
| parent | gpgtar: Improve error messages. (diff) | |
| download | gnupg2-91ae3e7fb66271691f6fe507262a62fc7e2663a3.tar.xz gnupg2-91ae3e7fb66271691f6fe507262a62fc7e2663a3.zip | |
agent: Re-introduce --enable-extended-key-format.
* agent/gpg-agent.c (oEnableExtendedKeyFormat): Re-introduce.
(parse_rereadable_options): Handle it in a special way.
* agent/protect.c (agent_protect): Be safe and set use_ocb only to 1
or 0.
* tools/gpgconf-comp.c: Add --enable-extended-key-format again.
--
This is required for backward compatible with profiles.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/protect.c b/agent/protect.c index eda247f27..61fb8f45d 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -623,7 +623,7 @@ agent_protect (const unsigned char *plainkey, const char *passphrase, int have_curve = 0; if (use_ocb == -1) - use_ocb = opt.enable_extended_key_format; + use_ocb = !!opt.enable_extended_key_format; /* Create an S-expression with the protected-at timestamp. */ memcpy (timestamp_exp, "(12:protected-at15:", 19); |