From: Rich Salz <rsalz@openssl.org>
Date: Sun, 13 Dec 2015 00:28:31 +0000 (-0500)
Subject: Revert "Allow ChaCha20-Poly1305 in DTLS"
X-Git-Tag: OpenSSL_1_1_0-pre2~247
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5320c071935ac7b52ed30ba66492da9549ad1c05;p=oweals%2Fopenssl.git

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 <matt@openssl.org>
---

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);