summaryrefslogtreecommitdiffstats
path: root/ssl/ssltest.c
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:28:48 +0000
commit0ced72c608b226481b2929af57b28dbe49034881 (patch)
treee501161a3ba84aca75886ce0beeda8c2d73e4c7c /ssl/ssltest.c
parent5584a9549086dfe6497b6694dd1bf7c6e8d95e23 (diff)
Fix in ssltest is no-ssl2 configured
(cherry picked from commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4)
Diffstat (limited to 'ssl/ssltest.c')
-rw-r--r--ssl/ssltest.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 3c010409ab..f8c75c09d7 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -970,7 +970,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