From b24af74d94fe5b7129d843c9b3c8ed74e429bedb Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 8 Jul 2009 15:33:59 +0000 Subject: 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 --- res/res_crypto.c | 2 -- res/res_jabber.c | 4 ---- 2 files changed, 6 deletions(-) (limited to 'res') diff --git a/res/res_crypto.c b/res/res_crypto.c index d8bf1da45..9a39b2fa0 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -585,8 +585,6 @@ static struct ast_cli_entry cli_crypto[] = { /*! \brief initialise the res_crypto module */ static int crypto_init(void) { - SSL_library_init(); - ERR_load_crypto_strings(); ast_cli_register_multiple(cli_crypto, ARRAY_LEN(cli_crypto)); /* Install ourselves into stubs */ diff --git a/res/res_jabber.c b/res/res_jabber.c index e2b831015..6a3ac5a57 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -621,10 +621,6 @@ static int aji_tls_handshake(struct aji_client *client) ast_debug(1, "Starting TLS handshake\n"); - /* Load encryption, hashing algorithms and error strings */ - SSL_library_init(); - SSL_load_error_strings(); - /* Choose an SSL/TLS protocol version, create SSL_CTX */ client->ssl_method = SSLv3_method(); client->ssl_context = SSL_CTX_new(client->ssl_method); -- cgit v1.2.3