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

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 498c28b4915e8e0f313e811b7f71f60892f29f88..9ad2a3d504213e60dc34acb10dd9c8b4f3d5e955 100644 (file)
--- 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)