[asterisk-commits] russell: branch 1.6.1 r205153 - in /branches/1.6.1: ./ main/ssl.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Jul  8 10:57:27 2009
New Revision: 205153

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205153
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/ssl.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/ssl.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/ssl.c?view=diff&rev=205153&r1=205152&r2=205153
==============================================================================
--- branches/1.6.1/main/ssl.c (original)
+++ branches/1.6.1/main/ssl.c Wed Jul  8 10:57:27 2009
@@ -45,23 +45,23 @@
 
 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;
-        }
+				ssl_num_locks, n);
+		return;
+	}
 
-        if (mode & CRYPTO_LOCK) {
-                ast_mutex_lock(&ssl_locks[n]);
-        } else {
-                ast_mutex_unlock(&ssl_locks[n]);
-        }
+	if (mode & CRYPTO_LOCK) {
+		ast_mutex_lock(&ssl_locks[n]);
+	} else {
+		ast_mutex_unlock(&ssl_locks[n]);
+	}
 }
 
 #endif /* HAVE_OPENSSL */
@@ -73,28 +73,28 @@
 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;
 }