recent changes from 0.9.8: fix cipher list order in s3_lib.c,

[openssl.git] / ssl / s23_meth.c

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index c88569d32ceb9fa16912c8f28ac18c6a314afd25..c6099efcf75726b72b1b47d83a03c21d8b81bb4a 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -60,16 +60,24 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-static SSL_METHOD *ssl23_get_method(int ver);
-static SSL_METHOD *ssl23_get_method(int ver)
+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);
        }