generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

synchronise with main 0.9.6 stable branch

Browse Source
This commit is contained in:
Bodo Möller
2001-11-12 22:42:40 +00:00
parent c3970428ac
commit da904c9cef
118 changed files with 2172 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ssl/ssl_lib.c
View File

@@ -142,7 +142,7 @@ int SSL_clear(SSL *s)
#if 1
/* Check to see if we were changed into a different method, if
* so, revert back if we are not doing session-id reuse. */
if ((s->session == NULL) && (s->method != s->ctx->method))
if (!s->in_handshake && (s->session == NULL) && (s->method != s->ctx->method))
{
s->method->ssl_free(s);
s->method=s->ctx->method;
@@ -410,6 +410,11 @@ BIO *SSL_get_wbio(SSL *s)
{ return(s->wbio); }
int SSL_get_fd(SSL *s)
{
return(SSL_get_rfd(s));
}
int SSL_get_rfd(SSL *s)
{
int ret= -1;
BIO *b,*r;
@@ -421,6 +426,18 @@ int SSL_get_fd(SSL *s)
return(ret);
}
int SSL_get_wfd(SSL *s)
{
int ret= -1;
BIO *b,*r;
b=SSL_get_wbio(s);
r=BIO_find_type(b,BIO_TYPE_DESCRIPTOR);
if (r != NULL)
BIO_get_fd(r,&ret);
return(ret);
}
#ifndef NO_SOCK
int SSL_set_fd(SSL *s,int fd)
{
@@ -1276,8 +1293,6 @@ void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*cb)(int, X509_STORE_CTX *))
{
ctx->verify_mode=mode;
ctx->default_verify_callback=cb;
/* This needs cleaning up EAY EAY EAY */
X509_STORE_set_verify_cb_func(ctx->cert_store,cb);
}
void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth)