diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:57:27 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:57:27 +0000 |
commit | 42a9582498030915d0781c09881046b54d59067d (patch) | |
tree | 825fe3548284977de3adc23bd32279dc735c379d /main | |
parent | fe0a9734a4ad4e8fa17aa357890eb7ff1844f44a (diff) |
Merged revisions 205151 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r205151 | russell | 2009-07-08 10:56:28 -0500 (Wed, 08 Jul 2009) | 2 lines
Use tabs instead of spaces for indentation.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@205153 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/ssl.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/main/ssl.c b/main/ssl.c index 4f039c4f1..99c2cb4a8 100644 --- a/main/ssl.c +++ b/main/ssl.c @@ -45,23 +45,23 @@ static int ssl_num_locks; static unsigned long ssl_threadid(void) { - return pthread_self(); + return pthread_self(); } static void ssl_lock(int mode, int n, const char *file, int line) { - if (n < 0 || n >= ssl_num_locks) { - ast_log(LOG_ERROR, "OpenSSL is full of LIES!!! - " + if (n < 0 || n >= ssl_num_locks) { + ast_log(LOG_ERROR, "OpenSSL is full of LIES!!! - " "ssl_num_locks '%d' - n '%d'\n", - ssl_num_locks, n); - return; - } - - if (mode & CRYPTO_LOCK) { - ast_mutex_lock(&ssl_locks[n]); - } else { - ast_mutex_unlock(&ssl_locks[n]); - } + ssl_num_locks, n); + return; + } + + if (mode & CRYPTO_LOCK) { + ast_mutex_lock(&ssl_locks[n]); + } else { + ast_mutex_unlock(&ssl_locks[n]); + } } #endif /* HAVE_OPENSSL */ @@ -73,28 +73,28 @@ static void ssl_lock(int mode, int n, const char *file, int line) int ast_ssl_init(void) { #ifdef HAVE_OPENSSL - unsigned int i; + unsigned int i; - SSL_library_init(); - SSL_load_error_strings(); - ERR_load_crypto_strings(); - ERR_load_BIO_strings(); - OpenSSL_add_all_algorithms(); + SSL_library_init(); + SSL_load_error_strings(); + ERR_load_crypto_strings(); + ERR_load_BIO_strings(); + OpenSSL_add_all_algorithms(); - /* Make OpenSSL thread-safe. */ + /* Make OpenSSL thread-safe. */ - CRYPTO_set_id_callback(ssl_threadid); + CRYPTO_set_id_callback(ssl_threadid); - ssl_num_locks = CRYPTO_num_locks(); - if (!(ssl_locks = ast_calloc(ssl_num_locks, sizeof(ssl_locks[0])))) { - return -1; - } - for (i = 0; i < ssl_num_locks; i++) { - ast_mutex_init(&ssl_locks[i]); - } - CRYPTO_set_locking_callback(ssl_lock); + ssl_num_locks = CRYPTO_num_locks(); + if (!(ssl_locks = ast_calloc(ssl_num_locks, sizeof(ssl_locks[0])))) { + return -1; + } + for (i = 0; i < ssl_num_locks; i++) { + ast_mutex_init(&ssl_locks[i]); + } + CRYPTO_set_locking_callback(ssl_lock); #endif /* HAVE_OPENSSL */ - return 0; + return 0; } |