diff options
| author | Joe Orton <jorton@apache.org> | 2016-11-14 11:57:46 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2016-11-14 11:57:46 +0100 |
| commit | 6020903e0c2bd461e00341c6ebe44fe5e76f0359 (patch) | |
| tree | 0b65629d00eefac3e50ea888a4aec05833b0f5f3 /modules/ssl/ssl_engine_vars.c | |
| parent | Remove trailing whitespace. (diff) | |
| download | apache2-6020903e0c2bd461e00341c6ebe44fe5e76f0359.tar.xz apache2-6020903e0c2bd461e00341c6ebe44fe5e76f0359.zip | |
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert): Use const
ASN1_OBJECT for X509_ALGOR_get0() for OpenSSL >= 1.1.0 per
https://github.com/openssl/openssl/commit/ac4e257747075958d37665f327bdf685dd2478ab
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1769592 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_engine_vars.c')
| -rw-r--r-- | modules/ssl/ssl_engine_vars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index 6b745dde68..85cbb3f1a9 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -606,7 +606,7 @@ static char *ssl_var_lookup_ssl_cert(apr_pool_t *p, request_rec *r, X509 *xs, #if OPENSSL_VERSION_NUMBER < 0x10100000L nid = OBJ_obj2nid((ASN1_OBJECT *)(xs->cert_info->signature->algorithm)); #else - ASN1_OBJECT *paobj; + const ASN1_OBJECT *paobj; X509_ALGOR_get0(&paobj, NULL, NULL, X509_get0_tbs_sigalg(xs)); nid = OBJ_obj2nid(paobj); #endif |