Fix for previous change: explicitly named ciphersuites are OK to add
authorBodo Möller <bodo@openssl.org>
Thu, 22 Jun 2006 13:07:45 +0000 (13:07 +0000)
committerBodo Möller <bodo@openssl.org>
Thu, 22 Jun 2006 13:07:45 +0000 (13:07 +0000)
ssl/ssl_ciph.c

index 498c28b..9ad2a3d 100644 (file)
@@ -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)