summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2006-06-22 13:07:45 +0000
committerBodo Möller <bodo@openssl.org>2006-06-22 13:07:45 +0000
commite6e3f38bfa798bcf065a4f136f2bf7a897ab6715 (patch)
tree23a4414fd9b90b453eb476989b9ab1ece7204c3c /ssl/ssl_ciph.c
parentaa17ab7e5732f424c143b154fe563580db420784 (diff)
Fix for previous change: explicitly named ciphersuites are OK to add
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c2
1 files changed, 1 insertions, 1 deletions
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)