Author: billbarker
Date: Thu Jan 14 02:25:19 2016
New Revision: 1724533
URL: http://svn.apache.org/viewvc?rev=1724533&view=rev
Log:
CRYPTO_malloc_init has been removed from OpenSSL master
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1724533&r1=1724532&r2=1724533&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Thu Jan 14 02:25:19 2016
@@ -661,7 +661,9 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
/* We must register the library in full, to ensure our configuration
* code can successfully test the SSL environment.
*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
CRYPTO_malloc_init();
+#endif
ERR_load_crypto_strings();
SSL_load_error_strings();
SSL_library_init();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
