summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-02-11 18:17:50 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-02-11 18:27:33 +0000
commitfbe621d08f2026926c91c1c5f386b27605e39a43 (patch)
treeeee5445f64d4403912fed3f163829de23ff23f82 /ssl
parent2e9fd4301f23b958ec1f0e402885b74f1d7314d5 (diff)
Fix in ssltest is no-ssl2 configured
(cherry picked from commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssltest.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 310e0677e9..26ff634ea3 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -735,7 +735,13 @@ bad:
meth=SSLv23_method();
#else
#ifdef OPENSSL_NO_SSL2
- meth=SSLv3_method();
+ if (tls1)
+ meth=TLSv1_method();
+ else
+ if (ssl3)
+ meth=SSLv3_method();
+ else
+ meth=SSLv23_method();
#else
meth=SSLv2_method();
#endif