aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2023-04-06 07:21:33 +0000
committerWerner Koch <[email protected]>2023-04-06 07:21:33 +0000
commitb349ceedfca2780a7dfd79e6bee476b060f35ca5 (patch)
tree2f1f52ce6bef49d321382e1ad644c044ee552084
parentspeedo: Fix regression due to switching from gcc 8.3 to 10.2 (diff)
downloadgnupg-b349ceedfca2780a7dfd79e6bee476b060f35ca5.tar.gz
gnupg-b349ceedfca2780a7dfd79e6bee476b060f35ca5.zip
gpg: Take care not to encrypt with OCB in de-vs mode
* g10/encrypt.c (use_aead): In de-vs mode use OCB only if the compatibility flag ist set.
-rw-r--r--g10/encrypt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 3d8d9160f..d84596939 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -262,6 +262,10 @@ 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. */