diff options
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index ace164f673..e6a9f57f11 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -380,7 +380,7 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) else verify_store = s->ctx->cert_store; - ctx = X509_STORE_CTX_new_with_libctx(s->ctx->libctx, s->ctx->propq); + ctx = X509_STORE_CTX_new_ex(s->ctx->libctx, s->ctx->propq); if (ctx == NULL) { SSLerr(SSL_F_SSL_VERIFY_CERT_CHAIN, ERR_R_MALLOC_FAILURE); return 0; @@ -605,9 +605,9 @@ static unsigned long xname_hash(const X509_NAME *a) return X509_NAME_hash((X509_NAME *)a); } -STACK_OF(X509_NAME) *SSL_load_client_CA_file_with_libctx(const char *file, - OPENSSL_CTX *libctx, - const char *propq) +STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, + OPENSSL_CTX *libctx, + const char *propq) { BIO *in = BIO_new(BIO_s_file()); X509 *x = NULL; @@ -621,7 +621,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_with_libctx(const char *file, goto err; } - x = X509_new_with_libctx(libctx, propq); + x = X509_new_ex(libctx, propq); if (x == NULL) { SSLerr(0, ERR_R_MALLOC_FAILURE); goto err; @@ -676,7 +676,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_with_libctx(const char *file, STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) { - return SSL_load_client_CA_file_with_libctx(file, NULL, NULL); + return SSL_load_client_CA_file_ex(file, NULL, NULL); } int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, @@ -881,7 +881,7 @@ int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags) untrusted = cpk->chain; } - xs_ctx = X509_STORE_CTX_new_with_libctx(real_ctx->libctx, ctx->propq); + xs_ctx = X509_STORE_CTX_new_ex(real_ctx->libctx, ctx->propq); if (xs_ctx == NULL) { SSLerr(SSL_F_SSL_BUILD_CERT_CHAIN, ERR_R_MALLOC_FAILURE); goto err; |