diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:33:59 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:33:59 +0000 |
commit | b24af74d94fe5b7129d843c9b3c8ed74e429bedb (patch) | |
tree | 97cb548c9bb88133e72521dd38541ea8a97fd0b4 /main/asterisk.c | |
parent | 9a2e0f54d8bce5ad3600d54f8441254321050e3c (diff) |
Merged revisions 205120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r205120 | russell | 2009-07-08 10:17:19 -0500 (Wed, 08 Jul 2009) | 16 lines
Move OpenSSL initialization to a single place, make library usage thread-safe.
While doing some reading about OpenSSL, I noticed a couple of things that
needed to be improved with our usage of OpenSSL.
1) We had initialization of the library done in multiple modules. This has now
been moved to a core function that gets executed during Asterisk startup.
We already link OpenSSL into the core for TCP/TLS functionality, so this
was the most logical place to do it.
2) OpenSSL is not thread-safe by default. However, making it thread safe is
very easy. We just have to provide a couple of callbacks. One callback
returns a thread ID. The other handles locking. For more information,
start with the "Is OpenSSL thread-safe?" question on the FAQ page of
openssl.org.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205148 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index f9c528a8c..adcd41238 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3573,6 +3573,11 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_ssl_init()) { + printf("%s", term_quit()); + exit(1); + } + #ifdef AST_XML_DOCS /* Load XML documentation. */ ast_xmldoc_load_documentation(); |