Import OpenSSL 1.0.1g

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 0f8fd3902d..4f80be8ee4 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -543,8 +543,8 @@ int main(int argc, char *argv[])
         int comp = 0;
 #ifndef OPENSSL_NO_COMP
         COMP_METHOD *cm = NULL;
-#endif
         STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
+#endif
         int test_cipherlist = 0;
 #ifdef OPENSSL_FIPS
         int fips_mode=0;
@@ -881,7 +881,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