You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2016/11/14 10:57:46 UTC
svn commit: r1769592 - /httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
Author: jorton
Date: Mon Nov 14 10:57:46 2016
New Revision: 1769592
URL: http://svn.apache.org/viewvc?rev=1769592&view=rev
Log:
* 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
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c?rev=1769592&r1=1769591&r2=1769592&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c Mon Nov 14 10:57:46 2016
@@ -606,7 +606,7 @@ static char *ssl_var_lookup_ssl_cert(apr
#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