From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 23 Feb 2024 08:55:04 +0000 (+0200)
Subject: mail-crypt: Finish marking ChaCha20-Poly1305 as AEAD cipher
X-Git-Tag: 2.4.1~1030
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3868d05f5d9aa42d919e744cc70c3f1d15a449c;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Finish marking ChaCha20-Poly1305 as AEAD cipher
---

diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index 4c096de88d..d67cd66a10 100644
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -262,7 +262,9 @@ mail_crypt_mail_save_begin(struct mail_save_context *ctx,
 	enum io_stream_encrypt_flags enc_flags = 0;
 	if (muser != NULL && muser->set->crypt_write_algorithm[0] != '\0') {
 		if (strstr(muser->set->crypt_write_algorithm, "gcm") != NULL ||
-		    strstr(muser->set->crypt_write_algorithm, "ccm") != NULL)
+		    strstr(muser->set->crypt_write_algorithm, "ccm") != NULL ||
+		    strcasecmp(muser->set->crypt_write_algorithm,
+		       "chacha20-poly1305") == 0)
 			enc_flags = IO_STREAM_ENC_INTEGRITY_AEAD;
 		else
 			enc_flags = IO_STREAM_ENC_INTEGRITY_HMAC;