OpenSSL 0.9.4 merge

1 files changed, 16 insertions, 36 deletions

diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index e16f641101..822a395837 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -57,28 +57,17 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
+#include <openssl/objects.h>
 #include "ssl_locl.h"
 
-#ifndef NOPROTO
 static int ssl23_num_ciphers(void );
 static SSL_CIPHER *ssl23_get_cipher(unsigned int u);
-static int ssl23_read(SSL *s, char *buf, int len);
-static int ssl23_write(SSL *s, char *buf, int len);
+static int ssl23_read(SSL *s, void *buf, int len);
+static int ssl23_write(SSL *s, const void *buf, int len);
 static long ssl23_default_timeout(void );
-static int ssl23_put_cipher_by_char(SSL_CIPHER *c, unsigned char *p);
-static SSL_CIPHER *ssl23_get_cipher_by_char(unsigned char *p);
-#else
-static int ssl23_num_ciphers();
-static SSL_CIPHER *ssl23_get_cipher();
-static int ssl23_read();
-static int ssl23_write();
-static long ssl23_default_timeout();
-static int ssl23_put_cipher_by_char();
-static SSL_CIPHER *ssl23_get_cipher_by_char();
-#endif
-
-char *SSL23_version_str="SSLv2/3 compatablity part of SSLeay 0.7.0 30-Jan-1997";
+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;
 
 static SSL_METHOD SSLv23_data= {
         TLS1_VERSION,
@@ -88,10 +77,11 @@ static SSL_METHOD SSLv23_data= {
         ssl_undefined_function,
         ssl_undefined_function,
         ssl23_read,
-        ssl_undefined_function,
+        (int (*)(struct ssl_st *, char *, int))ssl_undefined_function,
         ssl23_write,
         ssl_undefined_function,
         ssl_undefined_function,
+        ssl_ok,
         ssl3_ctrl,
         ssl3_ctx_ctrl,
         ssl23_get_cipher_by_char,
@@ -104,23 +94,22 @@ static SSL_METHOD SSLv23_data= {
         &ssl3_undef_enc_method,
         };
 
-static long ssl23_default_timeout()
+static long ssl23_default_timeout(void)
         {
         return(300);
         }
 
-SSL_METHOD *sslv23_base_method()
+SSL_METHOD *sslv23_base_method(void)
         {
         return(&SSLv23_data);
         }
 
-static int ssl23_num_ciphers()
+static int ssl23_num_ciphers(void)
         {
         return(ssl3_num_ciphers()+ssl2_num_ciphers());
         }
 
-static SSL_CIPHER *ssl23_get_cipher(u)
-unsigned int u;
+static SSL_CIPHER *ssl23_get_cipher(unsigned int u)
         {
         unsigned int uu=ssl3_num_ciphers();
 
@@ -132,8 +121,7 @@ unsigned int u;
 
 /* This function needs to check if the ciphers required are actually
  * available */
-static SSL_CIPHER *ssl23_get_cipher_by_char(p)
-unsigned char *p;
+static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
         {
         SSL_CIPHER c,*cp;
         unsigned long id;
@@ -149,9 +137,7 @@ unsigned char *p;
         return(cp);
         }
 
-static int ssl23_put_cipher_by_char(c,p)
-SSL_CIPHER *c;
-unsigned char *p;
+static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
         {
         long l;
 
@@ -166,10 +152,7 @@ unsigned char *p;
         return(3);
         }
 
-static int ssl23_read(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+static int ssl23_read(SSL *s, void *buf, int len)
         {
         int n;
 
@@ -199,10 +182,7 @@ int len;
                 }
         }
 
-static int ssl23_write(s,buf,len)
-SSL *s;
-char *buf;
-int len;
+static int ssl23_write(SSL *s, const void *buf, int len)
         {
         int n;