From: Herwin Weststrate <herwin@snt.utwente.nl>
Date: Wed, 9 Nov 2016 20:00:09 +0000 (+0100)
Subject: Move OPENSSL_config call to block for version < 1.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f570cc80bd7adbd448780d743350a46d78f157;p=thirdparty%2Ffreeradius-server.git

Move OPENSSL_config call to block for version < 1.1

This function is deprecated in OpenSSL 1.1, in favour of
OPENSSL_init_crypto. Just call it at the same place as we would call
that new function.
---

diff --git a/src/main/tls/global.c b/src/main/tls/global.c
index 5a4daee1fdf..f1ce17139d9 100644
--- a/src/main/tls/global.c
+++ b/src/main/tls/global.c
@@ -376,6 +376,8 @@ int tls_global_init(void)
 		ERROR("FATAL: Failed to set up SSL mutexes");
 		return -1;
 	}
+
+	OPENSSL_config(NULL);
 #else
 	OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG | OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
 #endif
@@ -390,7 +392,6 @@ int tls_global_init(void)
 	ENGINE_register_all_complete();
 
 	tls_done_init = true;
-	OPENSSL_config(NULL);
 
 	return 0;
 }