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

Update from HEAD.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-06-04 22:39:29 +00:00
parent 5799b72178
commit 591371566e
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ssl/ssl_lib.c
View File

@@ -1511,6 +1511,21 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
ret->tlsext_status_cb = 0; ret->tlsext_status_cb = 0;
ret->tlsext_status_arg = NULL; ret->tlsext_status_arg = NULL;
#endif
#ifndef OPENSSL_NO_ENGINE
ret->client_cert_engine = NULL;
#ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO
#define eng_strx(x) #x
#define eng_str(x) eng_strx(x)
/* Use specific client engine automatically... ignore errors */
{
ENGINE *eng;
eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO));
if (!eng || !SSL_CTX_set_client_cert_engine(ret, eng))
ERR_clear_error();
}
#endif
#endif #endif
return(ret); return(ret);
@@ -1582,6 +1597,10 @@ void SSL_CTX_free(SSL_CTX *a)
sk_SSL_COMP_pop_free(a->comp_methods,SSL_COMP_free); sk_SSL_COMP_pop_free(a->comp_methods,SSL_COMP_free);
#else #else
a->comp_methods = NULL; a->comp_methods = NULL;
#endif
#ifndef OPENSSL_NO_ENGINE
if (a->client_cert_engine)
ENGINE_finish(a->client_cert_engine);
#endif #endif
OPENSSL_free(a); OPENSSL_free(a);
} }