aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-03-16 12:33:00 -0400
committerRich Salz <rsalz@openssl.org>2016-03-16 22:21:25 -0400
commit748f254657ab900c0de5e9e1843150c2df4c4bea (patch)
tree71fca621ae9f196baedea3095d206265ead55af2 /ssl/ssl_ciph.c
parent757c416c4d728c346e30e3e7a32fccc4d9be8329 (diff)
downloadopenssl-748f254657ab900c0de5e9e1843150c2df4c4bea.tar.gz
Sort cipher-list at runtime.
Reduces #ifdef complexity. Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f7e9259c93..aaeeb8da27 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -488,7 +488,9 @@ void ssl_load_ciphers(void)
{
size_t i;
const ssl_cipher_table *t;
+
disabled_enc_mask = 0;
+ ssl_sort_cipher_list();
for (i = 0, t = ssl_cipher_table_cipher; i < SSL_ENC_NUM_IDX; i++, t++) {
if (t->nid == NID_undef) {
ssl_cipher_methods[i] = NULL;