commit | b7c37f2fc0a891c01721ea6cedbc817dc2adb908 | [log] [tgz] |
---|---|---|
author | Dr. Stephen Henson <steve@openssl.org> | Mon Feb 11 18:17:50 2013 +0000 |
committer | Dr. Stephen Henson <steve@openssl.org> | Mon Feb 11 18:29:05 2013 +0000 |
tree | f2270cf98eaaefe6e0acd48c5422830182181fc6 | |
parent | 7e47a695448e72eafd32a3deb85a20372a3f807f [diff] [blame] |
Fix in ssltest is no-ssl2 configured (cherry picked from commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4)
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 542ae0e..db87b1a 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c
@@ -977,7 +977,13 @@ 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