Attachment #214392 for bug #246373




#endif
    free_dh_params();

#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
    /* Openssl v1.1+ handles all termination automatically. Do
     * nothing in this case.
     */
#else
    /*
     * Try to kill the internals of the SSL library.
     */

#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
    ERR_remove_thread_state(NULL);
#endif
#endif

#ifdef HAVE_KEYLOG_CALLBACK
    if (key_log_file) {

        TCN_FREE_CSTRING(engine);
        return (jint)APR_SUCCESS;
    }

    /* Openssl v1.1+ handles all initialisation automatically, apart
     * from hints as to how we want to use the library.
     *
     * We tell openssl we want to include engine support.
     */
    OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else
    /* We must register the library in full, to ensure our configuration
     * code can successfully test the SSL environment.
     */

#endif
    OPENSSL_load_builtin_modules();

#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if ! (defined(WIN32) || defined(WIN64))
    err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
                                       tcn_global_pool);
- 

Return to bug 246373

Lines 367-377 static apr_status_t ssl_init_cleanup(void *data) Link Here

(-)b/native/src/ssl.c (-15 / +2 lines)
367	#endif	367	#endif
368	free_dh_params();	368	free_dh_params();
369		369
370	#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
371	/* Openssl v1.1+ handles all termination automatically. Do
372	* nothing in this case.
373	*/
374	#else
375	/*	370	/*
376	* Try to kill the internals of the SSL library.	371	* Try to kill the internals of the SSL library.
377	*/	372	*/
Lines 394-400 static apr_status_t ssl_init_cleanup(void *data) Link Here
394	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)	389	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
395	ERR_remove_thread_state(NULL);	390	ERR_remove_thread_state(NULL);
396	#endif	391	#endif
397	#endif
398		392
399	#ifdef HAVE_KEYLOG_CALLBACK	393	#ifdef HAVE_KEYLOG_CALLBACK
400	if (key_log_file) {	394	if (key_log_file) {
Lines 764-777 TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine) Link Here
764	TCN_FREE_CSTRING(engine);	758	TCN_FREE_CSTRING(engine);
765	return (jint)APR_SUCCESS;	759	return (jint)APR_SUCCESS;
766	}	760	}
767	#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)	761
768	/* Openssl v1.1+ handles all initialisation automatically, apart
769	* from hints as to how we want to use the library.
770	*
771	* We tell openssl we want to include engine support.
772	*/
773	OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
774	#else
775	/* We must register the library in full, to ensure our configuration	762	/* We must register the library in full, to ensure our configuration
776	* code can successfully test the SSL environment.	763	* code can successfully test the SSL environment.
777	*/	764	*/
Lines 785-790 TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine) Link Here
785	#endif	772	#endif
786	OPENSSL_load_builtin_modules();	773	OPENSSL_load_builtin_modules();
787		774
		775	#if OPENSSL_VERSION_NUMBER < 0x10100000L
788	#if ! (defined(WIN32) \|\| defined(WIN64))	776	#if ! (defined(WIN32) \|\| defined(WIN64))
789	err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,	777	err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
790	tcn_global_pool);	778	tcn_global_pool);
791	-