From 935487b66363c9932684d8085f47450d65a8c37e Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 17 Dec 2014 11:22:48 -0500
Subject: [PATCH] avoid race condition by making OpenSSL thread safe

---
 daemon/main.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/daemon/main.c b/daemon/main.c
index 6975dea8d2..5815af98ec 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -80,6 +80,7 @@ struct main_context {
 
 
 static int global_shutdown;
+static mutex_t *openssl_locks;
 
 static char *pidfile;
 static gboolean foreground;
@@ -439,6 +440,36 @@ static void wpidfile(void) {
 }
 
 
+static void cb_openssl_threadid(CRYPTO_THREADID *tid) {
+	pthread_t me;
+
+	me = pthread_self();
+
+	if (sizeof(me) == sizeof(void *))
+		CRYPTO_THREADID_set_pointer(tid, (void *) me);
+	else
+		CRYPTO_THREADID_set_numeric(tid, (unsigned long) me);
+}
+
+static void cb_openssl_lock(int mode, int type, const char *file, int line) {
+	if ((type & CRYPTO_LOCK))
+		mutex_lock(&openssl_locks[type]);
+	else
+		mutex_unlock(&openssl_locks[type]);
+}
+
+static void make_OpenSSL_thread_safe(void) {
+	int i;
+
+	openssl_locks = malloc(sizeof(*openssl_locks) * CRYPTO_num_locks());
+	for (i = 0; i < CRYPTO_num_locks(); i++)
+		mutex_init(&openssl_locks[i]);
+
+	CRYPTO_THREADID_set_callback(cb_openssl_threadid);
+	CRYPTO_set_locking_callback(cb_openssl_lock);
+}
+
+
 static void init_everything() {
 	struct timespec ts;
 
@@ -447,6 +478,7 @@ static void init_everything() {
 	srandom(ts.tv_sec ^ ts.tv_nsec);
 	SSL_library_init();
 	SSL_load_error_strings();
+	make_OpenSSL_thread_safe();
 
 #if !GLIB_CHECK_VERSION(2,32,0)
 	g_thread_init(NULL);