From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 26 Aug 2015 13:03:24 +0000 (+0100)
Subject: Fix CCM support in DTLS
X-Git-Tag: OpenSSL_1_1_0-pre1~734
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=04dc8b36ef40d7ba8f33ff3d6c7c87a921e0715e

Fix CCM support in DTLS

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 2c3ab5423b..d2f5defe14 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -270,7 +270,8 @@ int dtls1_do_write(SSL *s, int type)
 
     if (s->write_hash) {
         if (s->enc_write_ctx
-            && EVP_CIPHER_CTX_mode(s->enc_write_ctx) == EVP_CIPH_GCM_MODE)
+            && ((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);