Comment.

[openssl.git] / ssl / s2_pkt.c

diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index 61b20305c1dff4d39b7515676571130c4c8c8f7f..73c96f3c3618e81f98bfd09be8469c8fbf5ef83d 100644 (file)
--- a/ssl/s2_pkt.c
+++ b/ssl/s2_pkt.c
@@ -61,25 +61,10 @@
 #define USE_SOCKETS
 #include "ssl_locl.h"
 
-/* SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_PEER_ERROR_NO_CIPHER);
- * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_PEER_ERROR_NO_CERTIFICATE);
- * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_PEER_ERROR_CERTIFICATE);
- * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE);
- * SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_UNKNOWN_REMOTE_ERROR_TYPE);
- */
-
-#ifndef NOPROTO
 static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend);
-static int do_ssl_write(SSL *s, const char *buf, unsigned int len);
-static int write_pending(SSL *s, const char *buf, unsigned int len);
+static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len);
+static int write_pending(SSL *s, const unsigned char *buf, unsigned int len);
 static int ssl_mt_error(int n);
-#else
-static int read_n();
-static int do_ssl_write();
-static int write_pending();
-static int ssl_mt_error();
-#endif
-
 int ssl2_peek(SSL *s, char *buf, int len)
        {
        int ret;
@@ -96,7 +81,7 @@ int ssl2_peek(SSL *s, char *buf, int len)
 /* SSL_read -
  * This routine will return 0 to len bytes, decrypted etc if required.
  */
-int ssl2_read(SSL *s, char *buf, int len)
+int ssl2_read(SSL *s, void *buf, int len)
        {
        int n;
        unsigned char mac[MAX_MAC_SIZE];
@@ -366,8 +351,9 @@ static int read_n(SSL *s, unsigned int n, unsigned int max,
        return(n);
        }
 
-int ssl2_write(SSL *s, const char *buf, int len)
+int ssl2_write(SSL *s, const void *_buf, int len)
        {
+       const unsigned char *buf=_buf;
        unsigned int n,tot;
        int i;
 
@@ -412,7 +398,7 @@ int ssl2_write(SSL *s, const char *buf, int len)
                }
        }
 
-static int write_pending(SSL *s, const char *buf, unsigned int len)
+static int write_pending(SSL *s, const unsigned char *buf, unsigned int len)
        {
        int i;
 
@@ -457,7 +443,7 @@ static int write_pending(SSL *s, const char *buf, unsigned int len)
                }
        }
 
-static int do_ssl_write(SSL *s, const char *buf, unsigned int len)
+static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)
        {
        unsigned int j,k,olen,p,mac_size,bs;
        register unsigned char *pp;
@@ -612,8 +598,7 @@ int ssl2_do_write(SSL *s)
        {
        int ret;
 
-       ret=ssl2_write(s,(char *)&(s->init_buf->data[s->init_off]),
-               s->init_num);
+       ret=ssl2_write(s,&s->init_buf->data[s->init_off],s->init_num);
        if (ret == s->init_num)
                return(1);
        if (ret < 0)