From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 11 Feb 2013 18:17:50 +0000 (+0000)
Subject: Fix in ssltest is no-ssl2 configured
X-Git-Tag: master-pre-reformat~1383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c37f2fc0a891c01721ea6cedbc817dc2adb908;p=thirdparty%2Fopenssl.git

Fix in ssltest is no-ssl2 configured
(cherry picked from commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4)
---

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 542ae0eef1e..db87b1a35ea 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -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