Attachment #519916 for bug #647976

View | Details | Raw Unified | Return to bug 647976
Collapse All | Expand All




 */
static apr_status_t crypto_shutdown(void)
{
#if APR_USE_OPENSSL_PRE_1_1_API
    ERR_free_strings();
    EVP_cleanup();
    ENGINE_cleanup();
#endif
    return APR_SUCCESS;
}


{
#if APR_USE_OPENSSL_PRE_1_1_API
    (void)CRYPTO_malloc_init();
#else
    OPENSSL_malloc_init();
#endif
    ERR_load_crypto_strings();
    /* SSL_load_error_strings(); */
    OpenSSL_add_all_algorithms();
#else
    OPENSSL_malloc_init();
#endif
    ENGINE_load_builtin_engines();
    ENGINE_register_all_complete();


Return to bug 647976

Lines 113-121 static apr_status_t crypto_error(const apu_err_t **result, Link Here

(-)a/crypto/apr_crypto_openssl.c (-3 / +5 lines)
113	*/	113	*/
114	static apr_status_t crypto_shutdown(void)	114	static apr_status_t crypto_shutdown(void)
115	{	115	{
		116	#if APR_USE_OPENSSL_PRE_1_1_API
116	ERR_free_strings();	117	ERR_free_strings();
117	EVP_cleanup();	118	EVP_cleanup();
118	ENGINE_cleanup();	119	ENGINE_cleanup();
		120	#endif
119	return APR_SUCCESS;	121	return APR_SUCCESS;
120	}	122	}
121		123
Lines 132-143 static apr_status_t crypto_init(apr_pool_t pool, const char params, Link Here
132	{	134	{
133	#if APR_USE_OPENSSL_PRE_1_1_API	135	#if APR_USE_OPENSSL_PRE_1_1_API
134	(void)CRYPTO_malloc_init();	136	(void)CRYPTO_malloc_init();
135	#else
136	OPENSSL_malloc_init();
137	#endif
138	ERR_load_crypto_strings();	137	ERR_load_crypto_strings();
139	/* SSL_load_error_strings(); */	138	/* SSL_load_error_strings(); */
140	OpenSSL_add_all_algorithms();	139	OpenSSL_add_all_algorithms();
		140	#else
		141	OPENSSL_malloc_init();
		142	#endif
141	ENGINE_load_builtin_engines();	143	ENGINE_load_builtin_engines();
142	ENGINE_register_all_complete();	144	ENGINE_register_all_complete();
143		145