From: Andy Polyakov <appro@openssl.org>
Date: Tue, 13 Mar 2012 19:21:15 +0000 (+0000)
Subject: ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER [from HEAD].
X-Git-Tag: OpenSSL_1_0_1~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9cc42cb091c5c8beb69baaf84736e4f8f20668d1;p=oweals%2Fopenssl.git

ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER [from HEAD].
---

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index f32393c56b..201ca9ad6d 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -825,7 +825,10 @@ int tls1_enc(SSL *s, int send)
 				}
 			}
 		
-		if (EVP_Cipher(ds,rec->data,rec->input,l) < 0)
+		i = EVP_Cipher(ds,rec->data,rec->input,l);
+		if ((EVP_CIPHER_flags(ds->cipher)&EVP_CIPH_FLAG_CUSTOM_CIPHER)
+						?(i<0)
+						:(i==0))
 			return -1;	/* AEAD can fail to verify MAC */
 		if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send)
 			{