summaryrefslogtreecommitdiff
path: root/main/libasteriskssl.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2012-07-10 13:34:15 +0000
committerMatthew Jordan <mjordan@digium.com>2012-07-10 13:34:15 +0000
commitb1bb826350a828745b0ecf4751fdb79f88e8a83a (patch)
tree76cf18286924cd99fc2f55f017aa2c830dd17aef /main/libasteriskssl.c
parent7296b670d4ca4fdaba41b82a0236f0cb6dd1da02 (diff)
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
Diffstat (limited to 'main/libasteriskssl.c')
-rw-r--r--main/libasteriskssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
index 3babc142f..361875aa1 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)