From bffedb45f32b0e68b3d679e8654d1c13335b8790 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 25 Jun 2016 19:32:30 +0100 Subject: [PATCH] [Fix] Fix openssl initialization --- src/libutil/util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libutil/util.c b/src/libutil/util.c index 196c54222..21a05dadd 100644 --- a/src/libutil/util.c +++ b/src/libutil/util.c @@ -2010,25 +2010,26 @@ rspamd_init_libs (void) #ifdef HAVE_OPENSSL ERR_load_crypto_strings (); + SSL_load_error_strings (); OpenSSL_add_all_algorithms (); OpenSSL_add_all_digests (); OpenSSL_add_all_ciphers (); -#if OPENSSL_VERSION_NUMBER >= 0x1000104fL +#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && !defined(LIBRESSL_VERSION_NUMBER) ENGINE_load_builtin_engines (); if ((ctx->crypto_ctx->cpu_config & CPUID_RDRAND) == 0) { RAND_set_rand_engine (NULL); } #endif + #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) SSL_library_init (); #else OPENSSL_init_ssl (0, NULL); #endif - SSL_library_init (); - SSL_load_error_strings (); + OPENSSL_config (NULL); if (RAND_poll () == 0) { -- 2.39.5