diff options
| author | Bodo Möller <bodo@openssl.org> | 2001-03-09 10:09:20 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2001-03-09 10:09:20 +0000 |
| commit | e34cfcf7e19b5e5d39c8ba97e6e5f65f23b99ad6 (patch) | |
| tree | 481531b740b4a55f2292541092c5ea990d768ad5 /ssl | |
| parent | 135883505078a868349e0a3c24514099e3cb2dac (diff) | |
| download | openssl-e34cfcf7e19b5e5d39c8ba97e6e5f65f23b99ad6.tar.gz | |
Consistently use 'void *' for SSL read, peek and write functions.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s2_pkt.c | 2 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 8 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 6 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c index d2dbf348ca..4340404b8e 100644 --- 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 e9aae569df..31f4f80779 100644 --- 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); } @@ -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 9a593ed2a5..f8207fa423 100644 --- 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 a5b1e380e2..6f3b71087e 100644 --- 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); |