Commit ee410c86 authored by Joe Orton's avatar Joe Orton
Browse files

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
parent de2e43d9

modules/ssl/ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -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