From: Nils Larsch <nils@openssl.org>
Date: Sun, 15 Jan 2006 16:57:01 +0000 (+0000)
Subject: make "./configure no-ssl2" work again
X-Git-Tag: OpenSSL_0_9_8b~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45803988ce19ce0e7633d049a38e828828b027a7;p=oweals%2Fopenssl.git

make "./configure no-ssl2" work again

PR: 1217
---

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index c88569d32c..950d9aab3d 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -63,13 +63,21 @@
 static SSL_METHOD *ssl23_get_method(int ver);
 static SSL_METHOD *ssl23_get_method(int ver)
 	{
+#ifndef OPENSSL_NO_SSL2
 	if (ver == SSL2_VERSION)
 		return(SSLv2_method());
-	else if (ver == SSL3_VERSION)
+	else
+#endif
+#ifndef OPENSSL_NO_SSL3
+	if (ver == SSL3_VERSION)
 		return(SSLv3_method());
-	else if (ver == TLS1_VERSION)
+	else
+#endif
+#ifndef OPENSSL_NO_TLS1
+	if (ver == TLS1_VERSION)
 		return(TLSv1_method());
 	else
+#endif
 		return(NULL);
 	}
 
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index c93c5063ab..137b68b857 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -2241,6 +2241,7 @@ static int do_test_cipherlist(void)
 	const SSL_METHOD *meth;
 	SSL_CIPHER *ci, *tci = NULL;
 
+#ifndef OPENSSL_NO_SSL2
 	fprintf(stderr, "testing SSLv2 cipher list order: ");
 	meth = SSLv2_method();
 	while ((ci = meth->get_cipher(i++)) != NULL)
@@ -2254,7 +2255,8 @@ static int do_test_cipherlist(void)
 		tci = ci;
 		}
 	fprintf(stderr, "ok\n");
-
+#endif
+#ifndef OPENSSL_NO_SSL3
 	fprintf(stderr, "testing SSLv3 cipher list order: ");
 	meth = SSLv3_method();
 	tci = NULL;
@@ -2269,7 +2271,8 @@ static int do_test_cipherlist(void)
 		tci = ci;
 		}
 	fprintf(stderr, "ok\n");
-
+#endif
+#ifndef OPENSSL_NO_TLS1
 	fprintf(stderr, "testing TLSv1 cipher list order: ");
 	meth = TLSv1_method();
 	tci = NULL;
@@ -2284,6 +2287,7 @@ static int do_test_cipherlist(void)
 		tci = ci;
 		}
 	fprintf(stderr, "ok\n");
+#endif
 
 	return 1;
 	}