diff options
| author | kris <kris@FreeBSD.org> | 2001-05-20 03:07:21 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-05-20 03:07:21 +0000 |
| commit | d8a086ad8867a06a52ea87d21003aebea4d2137c (patch) | |
| tree | f48dbf0518066eb822cedea74ef34e6425c069ff /crypto/openssl/ssl/ssl_lib.c | |
| parent | fbf9b01e961ea8f2f5bdfdef1ade0f5eb587b43b (diff) | |
| parent | 12896e829e9474d92c70a1528cc64270e9dc08ad (diff) | |
| download | FreeBSD-src-d8a086ad8867a06a52ea87d21003aebea4d2137c.zip FreeBSD-src-d8a086ad8867a06a52ea87d21003aebea4d2137c.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r76866,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index fec98dd..1fe85b6 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -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,8 +724,14 @@ 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) + { + SSLerr(SSL_F_SSL_READ, SSL_R_UNINITIALIZED); + return -1; + } + if (s->shutdown & SSL_RECEIVED_SHUTDOWN) { return(0); @@ -733,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) { @@ -1679,6 +1685,10 @@ SSL *SSL_dup(SSL *s) if (s->cert != NULL) { + if (ret->cert != NULL) + { + ssl_cert_free(ret->cert); + } ret->cert = ssl_cert_dup(s->cert); if (ret->cert == NULL) goto err; |
