From 9ece505c5ca92218e41adedfa6d8c47574bd9271 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Fri, 10 Jul 2015 08:56:32 -0400
Subject: Update openssl: 1.0.2c -> 1.0.2d

---
 openssl/crypto/evp/e_aes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl/crypto/evp')

diff --git a/openssl/crypto/evp/e_aes.c b/openssl/crypto/evp/e_aes.c
index 33cbed87f..1734a823c 100644
--- a/openssl/crypto/evp/e_aes.c
+++ b/openssl/crypto/evp/e_aes.c
@@ -1771,7 +1771,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
     case EVP_CTRL_CCM_SET_TAG:
         if ((arg & 1) || arg < 4 || arg > 16)
             return 0;
-        if ((c->encrypt && ptr) || (!c->encrypt && !ptr))
+        if (c->encrypt && ptr)
             return 0;
         if (ptr) {
             cctx->tag_set = 1;
-- 
cgit v1.2.3