X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs2_lib.c;h=a454d73dc54ea3cd69b231456ea172ead2665205;hb=a51a97262de196f8d4940fe68d9412ec99cd555a;hp=a0edfb89602eebb6ffa3843fac51253da4acd79a;hpb=27545970134d703ed96027aac9b67eced124eec3;p=oweals%2Fopenssl.git

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index a0edfb8960..a454d73dc5 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -59,11 +59,9 @@
 #include "ssl_locl.h"
 #ifndef OPENSSL_NO_SSL2
 #include <stdio.h>
-#include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
-#include "cryptlib.h"
 
 static long ssl2_default_timeout(void );
 const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
@@ -139,6 +137,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={
 	SSL_ALL_STRENGTHS,
 	},
 /* IDEA_128_CBC_WITH_MD5 */
+#ifndef OPENSSL_NO_IDEA
 	{
 	1,
 	SSL2_TXT_IDEA_128_CBC_WITH_MD5,
@@ -151,6 +150,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={
 	SSL_ALL_CIPHERS,
 	SSL_ALL_STRENGTHS,
 	},
+#endif
 /* DES_64_CBC_WITH_MD5 */
 	{
 	1,
@@ -224,6 +224,10 @@ static SSL_METHOD SSLv2_data= {
 	ssl2_shutdown,
 	ssl_ok,	/* NULL - renegotiate */
 	ssl_ok,	/* NULL - check renegotiate */
+	NULL, /* NULL - ssl_get_message */
+	NULL, /* NULL - ssl_get_record */
+	NULL, /* NULL - ssl_write_bytes */
+	NULL, /* NULL - dispatch_alert */
 	ssl2_ctrl,	/* local */
 	ssl2_ctx_ctrl,	/* local */
 	ssl2_get_cipher_by_char,
@@ -234,7 +238,7 @@ static SSL_METHOD SSLv2_data= {
 	ssl_bad_method,
 	ssl2_default_timeout,
 	&ssl3_undef_enc_method,
-	ssl_undefined_function,
+	ssl_undefined_void_function,
 	ssl2_callback_ctrl,	/* local */
 	ssl2_ctx_callback_ctrl,	/* local */
 	};
@@ -262,7 +266,7 @@ SSL_CIPHER *ssl2_get_cipher(unsigned int u)
 		return(NULL);
 	}
 
-int ssl2_pending(SSL *s)
+int ssl2_pending(const SSL *s)
 	{
 	return SSL_in_init(s) ? 0 : s->s2->ract_data_length;
 	}
@@ -348,7 +352,7 @@ long ssl2_ctrl(SSL *s, int cmd, long larg, void *parg)
 	return(ret);
 	}
 
-long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)())
+long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
 	{
 	return(0);
 	}
@@ -358,7 +362,7 @@ long ssl2_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 	return(0);
 	}
 
-long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
+long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
 	{
 	return(0);
 	}