Author: billbarker
Date: Wed Jan 13 02:16:18 2016
New Revision: 1724345
URL: http://svn.apache.org/viewvc?rev=1724345&view=rev
Log:
It seems that CRYPTO_malloc_init has been removed from OpenSSL master, but not
yet from the header files. Waiting for next Gump run to see if anything else is
missing before porting to trunk
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1724345&r1=1724344&r2=1724345&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jan 13 02:16:18 2016
@@ -462,7 +462,7 @@ static void ssl_dyn_lock_function(int mo
else {
apr_thread_mutex_unlock(l->mutex);
}
-}
+
/*
* Dynamic lock destruction callback
@@ -661,11 +661,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
ssl_initialized = 0;
return (jint)APR_EINVAL;
}
-#endif
+
/* We must register the library in full, to ensure our configuration
* code can successfully test the SSL environment.
*/
CRYPTO_malloc_init();
+#endif
ERR_load_crypto_strings();
SSL_load_error_strings();
SSL_library_init();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
