X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs23_lib.c;h=24b884ff4c3ec926031be01906935367217cbff1;hp=e16f641101a07edf17d14246814d77c4fb861994;hb=60e31c3a4bbdbdb4259eaa3c48639f3e3915f380;hpb=58964a492275ca9a59a0cd9c8155cb2491b4b909 diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index e16f641101..24b884ff4c 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -64,10 +64,10 @@ 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_write(SSL *s, const char *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); +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); #else static int ssl23_num_ciphers(); static SSL_CIPHER *ssl23_get_cipher(); @@ -78,7 +78,7 @@ 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"; +char *SSL23_version_str="SSLv2/3 compatibility part of OpenSSL 0.9.2 31-Dec-1998"; static SSL_METHOD SSLv23_data= { TLS1_VERSION, @@ -88,10 +88,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, @@ -133,7 +134,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; +const unsigned char *p; { SSL_CIPHER c,*cp; unsigned long id; @@ -150,7 +151,7 @@ unsigned char *p; } static int ssl23_put_cipher_by_char(c,p) -SSL_CIPHER *c; +const SSL_CIPHER *c; unsigned char *p; { long l; @@ -201,7 +202,7 @@ int len; static int ssl23_write(s,buf,len) SSL *s; -char *buf; +const char *buf; int len; { int n;