wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Bodo Möller 2001-03-09 10:08:06 +00:00
parent ba41d8a556
commit c6a15854ee
8 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ssl/SSL_read.pod
View file

@ -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

2
doc/ssl/SSL_write.pod
View file

@ -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

6
doc/ssl/ssl.pod
View file

@ -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

2
ssl/s2_pkt.c
View file

@ -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);
}

2
ssl/s3_lib.c
View file

@ -1335,7 +1335,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);
}

8
ssl/ssl.h
View file

@ -206,7 +206,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);
@ -1061,9 +1061,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);

6
ssl/ssl_lib.c
View file

@ -708,7 +708,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)
{
@ -724,7 +724,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)
{
@ -739,7 +739,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)
{

4
ssl/ssl_locl.h
View file

@ -516,7 +516,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);
@ -564,7 +564,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);