From 5320c071935ac7b52ed30ba66492da9549ad1c05 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sat, 12 Dec 2015 19:28:31 -0500 Subject: [PATCH] Revert "Allow ChaCha20-Poly1305 in DTLS" This reverts commit 777f482d993322d69025014bf1b99c270c978fc0. Author credit missing. Reverting this and re-committing with an Author line. Reviewed-by: Matt Caswell --- ssl/statem/statem_dtls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index 258c6fc077..5194c7308e 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -235,8 +235,8 @@ int dtls1_do_write(SSL *s, int type) if (s->write_hash) { if (s->enc_write_ctx - && (EVP_CIPHER_CTX_flags(s->enc_write_ctx) & - EVP_CIPH_FLAG_AEAD_CIPHER) != 0) + && ((EVP_CIPHER_CTX_mode(s->enc_write_ctx) == EVP_CIPH_GCM_MODE) || + (EVP_CIPHER_CTX_mode(s->enc_write_ctx) == EVP_CIPH_CCM_MODE))) mac_size = 0; else mac_size = EVP_MD_CTX_size(s->write_hash); -- GitLab