From cc04fbe3f9303b75d60607a3f4a767039243aedc Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Thu, 15 Sep 2016 17:16:40 +0000 Subject: [PATCH] OpenSSL: Fix up rb_init_ssl() to use proper define from openssl_ratbox.h --- libratbox/src/openssl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c index 39ae5b77..7a52ad09 100644 --- a/libratbox/src/openssl.c +++ b/libratbox/src/openssl.c @@ -367,14 +367,12 @@ rb_ssl_shutdown(rb_fde_t *const F) int rb_init_ssl(void) { - /* - * OpenSSL 1.1.0 and above automatically initialises itself with sane defaults - */ - #if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L) - SSL_library_init(); +#ifndef LRB_SSL_NO_EXPLICIT_INIT + (void) SSL_library_init(); SSL_load_error_strings(); - #endif +#endif + rb_lib_log("%s: OpenSSL backend initialised", __func__); return 1; }