diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-08-26 14:03:24 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-02 21:23:12 +0100 |
| commit | 04dc8b36ef40d7ba8f33ff3d6c7c87a921e0715e (patch) | |
| tree | 07feb07697ea3269633c6430f4dca6f0ea4b8e60 | |
| parent | 6a096889d731a68fb74b7f71de9c9faf206a9da8 (diff) | |
Fix CCM support in DTLS
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | ssl/d1_both.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |