Consistently use 'void *' for SSL read, peek and write functions.

diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
index 91f068a1199048be905720199d1654bd99d8fa86..7db5ee0a22ad0e81ff95f1dc722b4738b9092868 100644 (file)
--- a/doc/ssl/SSL_read.pod
+++ b/doc/ssl/SSL_read.pod
@@ -8,7 +8,7 @@ SSL_read - read bytes from a TLS/SSL connection.
 
  #include <openssl/ssl.h>
 
- int SSL_read(SSL *ssl, char *buf, int num);
+ int SSL_read(SSL *ssl, void *buf, int num);
 
 =head1 DESCRIPTION
 

diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
index 6e3ecffa1a439a11b31853a31b67b0f0c743df02..be1ad76d3b4cf1ac63951ca1c9ca3d2fb1738ac1 100644 (file)
--- a/doc/ssl/SSL_write.pod
+++ b/doc/ssl/SSL_write.pod
@@ -8,7 +8,7 @@ SSL_write - write bytes to a TLS/SSL connection.
 
  #include <openssl/ssl.h>
 
- int SSL_write(SSL *ssl, char *buf, int num);
+ int SSL_write(SSL *ssl, const void *buf, int num);
 
 =head1 DESCRIPTION
 

diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod
index b0255e3695f2cc4f4ceff21e6e21fb4caf327bc4..aace43f919d1ada46a29cd8bb3e95722af0e7a50 100644 (file)
--- a/doc/ssl/ssl.pod
+++ b/doc/ssl/ssl.pod
@@ -544,11 +544,11 @@ connection defined in the B<SSL> structure.
 
 =item long B<SSL_num_renegotiations>(SSL *ssl);
 
-=item int B<SSL_peek>(SSL *ssl, char *buf, int num);
+=item int B<SSL_peek>(SSL *ssl, void *buf, int num);
 
 =item int B<SSL_pending>(SSL *ssl);
 
-=item int B<SSL_read>(SSL *ssl, char *buf, int num);
+=item int B<SSL_read>(SSL *ssl, void *buf, int num);
 
 =item int B<SSL_renegotiate>(SSL *ssl);
 
@@ -640,7 +640,7 @@ connection defined in the B<SSL> structure.
 
 =item int B<SSL_want_x509_lookup>(s);
 
-=item int B<SSL_write>(SSL *ssl, char *buf, int num);
+=item int B<SSL_write>(SSL *ssl, const void *buf, int num);
 
 =back
 

diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index d2dbf348caf1888c5bfeeb3a8c238b03882d3034..4340404b8e940e4c2163addc8b39b3ac96273000 100644 (file)
--- a/ssl/s2_pkt.c
+++ b/ssl/s2_pkt.c
@@ -300,7 +300,7 @@ int ssl2_read(SSL *s, void *buf, int len)
        return ssl2_read_internal(s, buf, len, 0);
        }
 
-int ssl2_peek(SSL *s, char *buf, int len)
+int ssl2_peek(SSL *s, void *buf, int len)
        {
        return ssl2_read_internal(s, buf, len, 1);
        }

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e9aae569df140ec5e50ce382c31ba0a93b2733ff..31f4f807790dd262571e2c437e7e36d08d817f5b 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1615,7 +1615,7 @@ int ssl3_read(SSL *s, void *buf, int len)
        return ssl3_read_internal(s, buf, len, 0);
        }
 
-int ssl3_peek(SSL *s, char *buf, int len)
+int ssl3_peek(SSL *s, void *buf, int len)
        {
        return ssl3_read_internal(s, buf, len, 1);
        }

diff --git a/ssl/ssl.h b/ssl/ssl.h
index fa0e658bb8e998825daa1eb0cec6d67d03725f6c..457e7efcb77cc858e100690be45fceac44134326 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -226,7 +226,7 @@ typedef struct ssl_method_st
        int (*ssl_accept)(SSL *s);
        int (*ssl_connect)(SSL *s);
        int (*ssl_read)(SSL *s,void *buf,int len);
-       int (*ssl_peek)(SSL *s,char *buf,int len);
+       int (*ssl_peek)(SSL *s,void *buf,int len);
        int (*ssl_write)(SSL *s,const void *buf,int len);
        int (*ssl_shutdown)(SSL *s);
        int (*ssl_renegotiate)(SSL *s);
@@ -1102,9 +1102,9 @@ int SSL_set_trust(SSL *s, int trust);
 void   SSL_free(SSL *ssl);
 int    SSL_accept(SSL *ssl);
 int    SSL_connect(SSL *ssl);
-int    SSL_read(SSL *ssl,char *buf,int num);
-int    SSL_peek(SSL *ssl,char *buf,int num);
-int    SSL_write(SSL *ssl,const char *buf,int num);
+int    SSL_read(SSL *ssl,void *buf,int num);
+int    SSL_peek(SSL *ssl,void *buf,int num);
+int    SSL_write(SSL *ssl,const void *buf,int num);
 long   SSL_ctrl(SSL *ssl,int cmd, long larg, char *parg);
 long   SSL_callback_ctrl(SSL *, int, void (*)());
 long   SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, char *parg);

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 9a593ed2a5fe1a755ea2fbca45598fd4b749cbc3..f8207fa4238b03bb90dae8154e1b7dd030ea0967 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -766,7 +766,7 @@ long SSL_get_default_timeout(SSL *s)
        return(s->method->get_timeout());
        }
 
-int SSL_read(SSL *s,char *buf,int num)
+int SSL_read(SSL *s,void *buf,int num)
        {
        if (s->handshake_func == 0)
                {
@@ -782,7 +782,7 @@ int SSL_read(SSL *s,char *buf,int num)
        return(s->method->ssl_read(s,buf,num));
        }
 
-int SSL_peek(SSL *s,char *buf,int num)
+int SSL_peek(SSL *s,void *buf,int num)
        {
        if (s->handshake_func == 0)
                {
@@ -797,7 +797,7 @@ int SSL_peek(SSL *s,char *buf,int num)
        return(s->method->ssl_peek(s,buf,num));
        }
 
-int SSL_write(SSL *s,const char *buf,int num)
+int SSL_write(SSL *s,const void *buf,int num)
        {
        if (s->handshake_func == 0)
                {

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index a5b1e380e2c53c4895de6e5e1b829ab4a06fad46..6f3b71087eecb10d6ebb2b2a238ecca2ff56d5df 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -526,7 +526,7 @@ void        ssl2_free(SSL *s);
 int    ssl2_accept(SSL *s);
 int    ssl2_connect(SSL *s);
 int    ssl2_read(SSL *s, void *buf, int len);
-int    ssl2_peek(SSL *s, char *buf, int len);
+int    ssl2_peek(SSL *s, void *buf, int len);
 int    ssl2_write(SSL *s, const void *buf, int len);
 int    ssl2_shutdown(SSL *s);
 void   ssl2_clear(SSL *s);
@@ -574,7 +574,7 @@ void        ssl3_free(SSL *s);
 int    ssl3_accept(SSL *s);
 int    ssl3_connect(SSL *s);
 int    ssl3_read(SSL *s, void *buf, int len);
-int    ssl3_peek(SSL *s,char *buf, int len);
+int    ssl3_peek(SSL *s, void *buf, int len);
 int    ssl3_write(SSL *s, const void *buf, int len);
 int    ssl3_shutdown(SSL *s);
 void   ssl3_clear(SSL *s);