From: Matthew Jordan Date: Tue, 10 Jul 2012 13:34:15 +0000 (+0000) Subject: Fix initial loading problem with res_curl X-Git-Tag: 11.0.0-beta1~139 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1bb826350a828745b0ecf4751fdb79f88e8a83a;p=thirdparty%2Fasterisk.git Fix initial loading problem with res_curl When the OpenSSL duplicate initialization issues were resolved in r351447, res_curl could fail to load if it checked SSL_library_init after SSL initialization completed. This is due to the SSL_library_init stub returning a value of 0 for success, as opposed to a value of 1. OpenSSL uses a value of 1 to indicate success - in fact, SSL_library_init is documented to always return 1. Interestingly, the CURL libraries actually checked the return value - the fact that nothing else that depends on OpenSSL was having problems loading probably means they don't check the return value. (closes issue AST-924) Reported by: Guenther Kelleter patches: (AST-924.patch license #6372 uploaded by Guenther Kelleter) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369870 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c index 3babc142fb..361875aa12 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -81,7 +81,7 @@ int SSL_library_init(void) ast_debug(1, "Called after startup... ignoring!\n"); } #endif - return 0; + return 1; } void SSL_load_error_strings(void)