1 files changed, 15 insertions, 2 deletions

diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index 822a395837..dded7a19c5 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -67,7 +67,7 @@ static int ssl23_write(SSL *s, const void *buf, int len);
 static long ssl23_default_timeout(void );
 static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
 static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
-char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
+const char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
 
 static SSL_METHOD SSLv23_data= {
         TLS1_VERSION,
@@ -92,6 +92,9 @@ static SSL_METHOD SSLv23_data= {
         ssl_bad_method,
         ssl23_default_timeout,
         &ssl3_undef_enc_method,
+        ssl_undefined_function,
+        ssl3_callback_ctrl,
+        ssl3_ctx_callback_ctrl,
         };
 
 static long ssl23_default_timeout(void)
@@ -106,7 +109,11 @@ SSL_METHOD *sslv23_base_method(void)
 
 static int ssl23_num_ciphers(void)
         {
-        return(ssl3_num_ciphers()+ssl2_num_ciphers());
+        return(ssl3_num_ciphers()
+#ifndef NO_SSL2
+               + ssl2_num_ciphers()
+#endif
+            );
         }
 
 static SSL_CIPHER *ssl23_get_cipher(unsigned int u)
@@ -116,7 +123,11 @@ static SSL_CIPHER *ssl23_get_cipher(unsigned int u)
         if (u < uu)
                 return(ssl3_get_cipher(u));
         else
+#ifndef NO_SSL2
                 return(ssl2_get_cipher(u-uu));
+#else
+                return(NULL);
+#endif
         }
 
 /* This function needs to check if the ciphers required are actually
@@ -132,8 +143,10 @@ static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
                 ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
         c.id=id;
         cp=ssl3_get_cipher_by_char(p);
+#ifndef NO_SSL2
         if (cp == NULL)
                 cp=ssl2_get_cipher_by_char(p);
+#endif
         return(cp);
         }