Author: rjung
Date: Mon Aug 28 03:19:15 2017
New Revision: 1806399
URL: http://svn.apache.org/viewvc?rev=1806399&view=rev
Log:
Replace use of deprecated ASN1_STRING_data with
ASN1_STRING_get0_data when building against
OpenSSL 1.1.0 and newer.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1806399&r1=1806398&r2=1806399&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Mon Aug 28 03:19:15 2017
@@ -182,7 +182,11 @@ static char *lookup_ssl_cert_dn(X509_NAM
ASN1_STRING *adata = X509_NAME_ENTRY_get_data(xsne);
int len = ASN1_STRING_length(adata);
result = malloc(len + 1);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
memcpy(result, ASN1_STRING_data(adata), len);
+#else
+ memcpy(result, ASN1_STRING_get0_data(adata), len);
+#endif
result[len] = '\0';
#if APR_CHARSET_EBCDIC
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1806399&r1=1806398&r2=1806399&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Aug 28 03:19:15
2017
@@ -37,6 +37,11 @@
<section name="Changes in 1.2.14">
<changelog>
<fix>
+ Replace use of deprecated <code>ASN1_STRING_data</code> with
+ <code>ASN1_STRING_get0_data</code> when building against
+ OpenSSL 1.1.0 and newer. (rjung)
+ </fix>
+ <fix>
Fix a thread local key leak. Only relevant when doing
SSL.initialize() and Library.terminate() a lot of times. (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
