From: Bodo Möller <bodo@openssl.org>
Date: Thu, 22 Jun 2006 13:07:45 +0000 (+0000)
Subject: Fix for previous change: explicitly named ciphersuites are OK to add
X-Git-Tag: OpenSSL_0_9_8c~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6e3f38bfa798bcf065a4f136f2bf7a897ab6715;p=openssl

Fix for previous change: explicitly named ciphersuites are OK to add
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 498c28b491..9ad2a3d504 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -643,7 +643,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
 					 * *explicitly* requested, but not implicitly (such as
 					 * as part of the "AES" alias). */
 
-					add_this_cipher = (mask & (SSL_kECDHE|SSL_kECDH|SSL_aECDSA)) != 0;
+					add_this_cipher = (mask & (SSL_kECDHE|SSL_kECDH|SSL_aECDSA)) != 0 || cipher_id != 0;
 					}
 				
 				if (add_this_cipher)