diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-16 12:33:00 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-16 22:21:25 -0400 |
| commit | 748f254657ab900c0de5e9e1843150c2df4c4bea (patch) | |
| tree | 71fca621ae9f196baedea3095d206265ead55af2 /test | |
| parent | 757c416c4d728c346e30e3e7a32fccc4d9be8329 (diff) | |
Sort cipher-list at runtime.
Reduces #ifdef complexity.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/ssltest.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/ssltest.c b/test/ssltest.c index 9460da57e7..cf9f060086 100644 --- a/test/ssltest.c +++ b/test/ssltest.c @@ -1057,7 +1057,6 @@ int main(int argc, char *argv[]) #endif int no_protocol; int min_version = 0, max_version = 0; - #ifndef OPENSSL_NO_CT /* * Disable CT validation by default, because it will interfere with @@ -1065,7 +1064,6 @@ int main(int argc, char *argv[]) */ ct_validation_cb ct_validation = NULL; #endif - SSL_CONF_CTX *s_cctx = NULL, *c_cctx = NULL, *s_cctx2 = NULL; STACK_OF(OPENSSL_STRING) *conf_args = NULL; char *arg = NULL, *argn = NULL; @@ -3569,6 +3567,7 @@ static int do_test_cipherlist(void) * call functions, thus avoiding auto-init */ OPENSSL_init_crypto(0, NULL); + OPENSSL_init_ssl(0, NULL); meth = TLS_method(); tci = NULL; |