Fix CCM support in DTLS

Reviewed-by: Matt Caswell <matt@openssl.org>
2015-08-26 14:03:24 +01:00
parent 6a096889d7
commit 04dc8b36ef
1 changed files with 2 additions and 1 deletions
--- 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);