Mark, On 4/8/15 7:47 AM, ma...@apache.org wrote: > Author: markt > Date: Wed Apr 8 11:47:09 2015 > New Revision: 1672068 > > URL: http://svn.apache.org/r1672068 > Log: > Remove unnecessary directives since the minimum OpenSSL version is 1.0.2
Maybe we want to include a preprocessor rule that kills the build if the OpenSSL version is too old? OTOH, configure should be able to tell that pre-build. I just don't know how to do that myself ;) -chris > 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=1672068&r1=1672067&r2=1672068&view=diff > ============================================================================== > --- tomcat/native/trunk/native/src/ssl.c (original) > +++ tomcat/native/trunk/native/src/ssl.c Wed Apr 8 11:47:09 2015 > @@ -281,21 +281,17 @@ static apr_status_t ssl_init_cleanup(voi > /* > * Try to kill the internals of the SSL library. > */ > -#if OPENSSL_VERSION_NUMBER >= 0x00907001 > /* Corresponds to OPENSSL_load_builtin_modules(): > * XXX: borrowed from apps.h, but why not CONF_modules_free() > * which also invokes CONF_modules_finish()? > */ > CONF_modules_unload(1); > -#endif > /* Corresponds to SSL_library_init: */ > EVP_cleanup(); > #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES > ENGINE_cleanup(); > #endif > -#if OPENSSL_VERSION_NUMBER >= 0x00907001 > CRYPTO_cleanup_all_ex_data(); > -#endif > ERR_remove_state(0); > > /* Don't call ERR_free_strings here; ERR_load_*_strings only > @@ -648,9 +644,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize > #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES > ENGINE_load_builtin_engines(); > #endif > -#if OPENSSL_VERSION_NUMBER >= 0x00907001 > OPENSSL_load_builtin_modules(); > -#endif > > /* Initialize thread support */ > ssl_thread_setup(tcn_global_pool); > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
signature.asc
Description: OpenPGP digital signature
