From 00fe865dbec8fb626a63ed9f5b0be4073597c7a8 Mon Sep 17 00:00:00 2001
From: Nils Larsch <nils@openssl.org>
Date: Sun, 15 Jan 2006 17:35:28 +0000
Subject: recent changes from 0.9.8: fix cipher list order in s3_lib.c, make
 "no-ssl2" work again

PR: 1217
---
 ssl/s23_meth.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'ssl/s23_meth.c')

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index 115dc11a7e..c6099efcf7 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -63,13 +63,21 @@
 static const SSL_METHOD *ssl23_get_method(int ver);
 static const 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);
 	}
 
-- 
cgit v1.2.3