From: Joe Orton Date: Mon, 14 Nov 2016 10:59:03 +0000 (+0000) Subject: Merge r1769592 from trunk. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b57c5fe6fee10baad51d9d040550a1d3e1a7814e;p=thirdparty%2Fapache%2Fhttpd.git Merge r1769592 from trunk. * 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/branches/2.4.x-openssl-1.1.0-compat@1769594 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index d7d1cde0c63..04b08790f48 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -532,7 +532,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