www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Support for OpenSSL 1.1.0:

Browse Source 
- X509_STORE_CTX is now opaque.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740653 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2016-04-23 13:17:52 +00:00
parent 6ba30d2c2b
commit e387d3e9c7
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ssl/ssl_util_stapling.c
View File

@@ -79,7 +79,7 @@ static X509 *stapling_get_issuer(modssl_ctx_t *mctx, X509 *x)
X509 *issuer = NULL;
int i;
X509_STORE *st = SSL_CTX_get_cert_store(mctx->ssl_ctx);
X509_STORE_CTX inctx;
X509_STORE_CTX *inctx;
STACK_OF(X509) *extra_certs = NULL;
#ifdef OPENSSL_NO_SSL_INTERN
@@ -100,13 +100,14 @@ static X509 *stapling_get_issuer(modssl_ctx_t *mctx, X509 *x)
}
}
if (!X509_STORE_CTX_init(&inctx, st, NULL, NULL))
inctx = X509_STORE_CTX_new();
if (!X509_STORE_CTX_init(inctx, st, NULL, NULL))
return 0;
if (X509_STORE_CTX_get1_issuer(&issuer, &inctx, x) <= 0)
if (X509_STORE_CTX_get1_issuer(&issuer, inctx, x) <= 0)
issuer = NULL;
X509_STORE_CTX_cleanup(&inctx);
X509_STORE_CTX_cleanup(inctx);
X509_STORE_CTX_free(inctx);
return issuer;
}
int ssl_stapling_init_cert(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,