Fix in ssltest is no-ssl2 configured
authorDr. Stephen Henson <steve@openssl.org>
Mon, 11 Feb 2013 18:17:50 +0000 (18:17 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 11 Feb 2013 18:29:05 +0000 (18:29 +0000)
(cherry picked from commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4)

ssl/ssltest.c

index 542ae0e..db87b1a 100644 (file)
@@ -977,7 +977,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