diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/encrypt.c | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 4 | ||||
| -rw-r--r-- | g10/keygen.c | 4 | ||||
| -rw-r--r-- | g10/options.h | 1 |
4 files changed, 1 insertions, 12 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index a4863fa5d..fbf355ecb 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -262,10 +262,6 @@ use_aead (pk_list_t pk_list, int algo) { int can_use; - if (!(opt.compat_flags & COMPAT_VSD_ALLOW_OCB) - && opt.compliance == CO_DE_VS) - return 0; /* Not yet allowed. */ - can_use = openpgp_cipher_get_algo_blklen (algo) == 16; /* With --force-aead we want AEAD. */ @@ -1001,7 +1001,6 @@ static struct debug_flags_s debug_flags [] = /* The list of compatibility flags. */ static struct compatibility_flags_s compatibility_flags [] = { - { COMPAT_VSD_ALLOW_OCB, "vsd-allow-ocb" }, { 0, NULL } }; @@ -3825,8 +3824,7 @@ main (int argc, char **argv) parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags); gnupg_set_compliance_extra_info (CO_EXTRA_INFO_MIN_RSA, opt.min_rsa_length); - if ((opt.compat_flags & COMPAT_VSD_ALLOW_OCB)) - gnupg_set_compliance_extra_info (CO_EXTRA_INFO_VSD_ALLOW_OCB, 1); + gnupg_set_compliance_extra_info (CO_EXTRA_INFO_VSD_ALLOW_OCB, 1); if (DBG_CLOCK) log_clock ("start"); diff --git a/g10/keygen.c b/g10/keygen.c index 52fd97a64..26126cde7 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -523,10 +523,6 @@ keygen_set_std_prefs (const char *string,int personal) xfree (prefstringbuf); } - /* For now we require a compat flag to set OCB into the preferences. */ - if (!(opt.compat_flags & COMPAT_VSD_ALLOW_OCB)) - ocb = 0; - if(!rc) { if(personal) diff --git a/g10/options.h b/g10/options.h index b3cb52003..8234bc731 100644 --- a/g10/options.h +++ b/g10/options.h @@ -354,7 +354,6 @@ EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode; EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; /* Compatibility flags */ -#define COMPAT_VSD_ALLOW_OCB 1 /* Compliance test macors. */ |