From d24375271b97e45deaeb1ef0a8434c64066ba2e8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 2 Apr 2017 20:02:55 +0200 Subject: agent: Use OCB for key protection with --enable-extended-key-format. * agent/protect.c (PROT_DEFAULT_TO_OCB): Remove macro. (agent_protect): Make the default protection mode depend on the extend key format option. Signed-off-by: Werner Koch --- agent/protect.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'agent/protect.c') diff --git a/agent/protect.c b/agent/protect.c index 09aa50352..a9de732a1 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -42,11 +42,6 @@ #include "../common/sexp-parse.h" -/* To use the openpgp-s2k3-ocb-aes scheme by default set the value of - * this macro to 1. Note that the caller of agent_protect may - * override this default. */ -#define PROT_DEFAULT_TO_OCB 0 - /* The protection mode for encryption. The supported modes for decryption are listed in agent_unprotect(). */ #define PROT_CIPHER GCRY_CIPHER_AES128 @@ -580,7 +575,7 @@ agent_protect (const unsigned char *plainkey, const char *passphrase, int have_curve = 0; if (use_ocb == -1) - use_ocb = PROT_DEFAULT_TO_OCB; + use_ocb = opt.enable_extended_key_format; /* Create an S-expression with the protected-at timestamp. */ memcpy (timestamp_exp, "(12:protected-at15:", 19); -- cgit v1.2.3