提交 e34cfcf7 编写于 作者: B Bodo Möller

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

上级 13588350
...@@ -8,7 +8,7 @@ SSL_read - read bytes from a TLS/SSL connection. ...@@ -8,7 +8,7 @@ SSL_read - read bytes from a TLS/SSL connection.
#include <openssl/ssl.h> #include <openssl/ssl.h>
int SSL_read(SSL *ssl, char *buf, int num); int SSL_read(SSL *ssl, void *buf, int num);
=head1 DESCRIPTION =head1 DESCRIPTION
......
...@@ -8,7 +8,7 @@ SSL_write - write bytes to a TLS/SSL connection. ...@@ -8,7 +8,7 @@ SSL_write - write bytes to a TLS/SSL connection.
#include <openssl/ssl.h> #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 =head1 DESCRIPTION
......
...@@ -544,11 +544,11 @@ connection defined in the B<SSL> structure. ...@@ -544,11 +544,11 @@ connection defined in the B<SSL> structure.
=item long B<SSL_num_renegotiations>(SSL *ssl); =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_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); =item int B<SSL_renegotiate>(SSL *ssl);
...@@ -640,7 +640,7 @@ connection defined in the B<SSL> structure. ...@@ -640,7 +640,7 @@ connection defined in the B<SSL> structure.
=item int B<SSL_want_x509_lookup>(s); =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 =back
......
...@@ -300,7 +300,7 @@ int ssl2_read(SSL *s, void *buf, int len) ...@@ -300,7 +300,7 @@ int ssl2_read(SSL *s, void *buf, int len)
return ssl2_read_internal(s, buf, len, 0); 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); return ssl2_read_internal(s, buf, len, 1);
} }
......
...@@ -1615,7 +1615,7 @@ int ssl3_read(SSL *s, void *buf, int len) ...@@ -1615,7 +1615,7 @@ int ssl3_read(SSL *s, void *buf, int len)
return ssl3_read_internal(s, buf, len, 0); 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); return ssl3_read_internal(s, buf, len, 1);
} }
......
...@@ -226,7 +226,7 @@ typedef struct ssl_method_st ...@@ -226,7 +226,7 @@ typedef struct ssl_method_st
int (*ssl_accept)(SSL *s); int (*ssl_accept)(SSL *s);
int (*ssl_connect)(SSL *s); int (*ssl_connect)(SSL *s);
int (*ssl_read)(SSL *s,void *buf,int len); 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_write)(SSL *s,const void *buf,int len);
int (*ssl_shutdown)(SSL *s); int (*ssl_shutdown)(SSL *s);
int (*ssl_renegotiate)(SSL *s); int (*ssl_renegotiate)(SSL *s);
...@@ -1102,9 +1102,9 @@ int SSL_set_trust(SSL *s, int trust); ...@@ -1102,9 +1102,9 @@ int SSL_set_trust(SSL *s, int trust);
void SSL_free(SSL *ssl); void SSL_free(SSL *ssl);
int SSL_accept(SSL *ssl); int SSL_accept(SSL *ssl);
int SSL_connect(SSL *ssl); int SSL_connect(SSL *ssl);
int SSL_read(SSL *ssl,char *buf,int num); int SSL_read(SSL *ssl,void *buf,int num);
int SSL_peek(SSL *ssl,char *buf,int num); int SSL_peek(SSL *ssl,void *buf,int num);
int SSL_write(SSL *ssl,const char *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_ctrl(SSL *ssl,int cmd, long larg, char *parg);
long SSL_callback_ctrl(SSL *, int, void (*)()); long SSL_callback_ctrl(SSL *, int, void (*)());
long SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, char *parg); long SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, char *parg);
......
...@@ -766,7 +766,7 @@ long SSL_get_default_timeout(SSL *s) ...@@ -766,7 +766,7 @@ long SSL_get_default_timeout(SSL *s)
return(s->method->get_timeout()); 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) if (s->handshake_func == 0)
{ {
...@@ -782,7 +782,7 @@ int SSL_read(SSL *s,char *buf,int num) ...@@ -782,7 +782,7 @@ int SSL_read(SSL *s,char *buf,int num)
return(s->method->ssl_read(s,buf,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) if (s->handshake_func == 0)
{ {
...@@ -797,7 +797,7 @@ int SSL_peek(SSL *s,char *buf,int num) ...@@ -797,7 +797,7 @@ int SSL_peek(SSL *s,char *buf,int num)
return(s->method->ssl_peek(s,buf,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) if (s->handshake_func == 0)
{ {
......
...@@ -526,7 +526,7 @@ void ssl2_free(SSL *s); ...@@ -526,7 +526,7 @@ void ssl2_free(SSL *s);
int ssl2_accept(SSL *s); int ssl2_accept(SSL *s);
int ssl2_connect(SSL *s); int ssl2_connect(SSL *s);
int ssl2_read(SSL *s, void *buf, int len); 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_write(SSL *s, const void *buf, int len);
int ssl2_shutdown(SSL *s); int ssl2_shutdown(SSL *s);
void ssl2_clear(SSL *s); void ssl2_clear(SSL *s);
...@@ -574,7 +574,7 @@ void ssl3_free(SSL *s); ...@@ -574,7 +574,7 @@ void ssl3_free(SSL *s);
int ssl3_accept(SSL *s); int ssl3_accept(SSL *s);
int ssl3_connect(SSL *s); int ssl3_connect(SSL *s);
int ssl3_read(SSL *s, void *buf, int len); 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_write(SSL *s, const void *buf, int len);
int ssl3_shutdown(SSL *s); int ssl3_shutdown(SSL *s);
void ssl3_clear(SSL *s); void ssl3_clear(SSL *s);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册