diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-13 17:10:35 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-13 17:10:35 +0000 |
| commit | 4f68ea16a3619d2206c652ba8c7c76c4158dcdca (patch) | |
| tree | 37f218d15254d60b50dd7b7d00ef7f207333a354 /src/libserver/cfg_utils.c | |
| parent | cee9e2c5c7c94f1d1d1c80e5b59ecb24713bab73 (diff) | |
| download | rspamd-4f68ea16a3619d2206c652ba8c7c76c4158dcdca.tar.gz rspamd-4f68ea16a3619d2206c652ba8c7c76c4158dcdca.zip | |
[Minor] Fix some of the moved functions
Diffstat (limited to 'src/libserver/cfg_utils.c')
| -rw-r--r-- | src/libserver/cfg_utils.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index dac2e13c4..0d4953d51 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -46,7 +46,6 @@ #include <openssl/evp.h> #include <openssl/ssl.h> #include <openssl/conf.h> -#include <openssl/engine.h> #endif #ifdef HAVE_LOCALE_H #include <locale.h> @@ -2639,44 +2638,6 @@ rspamd_config_ev_backend_to_string (int ev_backend, gboolean *effective) #undef SET_EFFECTIVE } -void -rspamd_openssl_maybe_init (void) -{ - static gboolean openssl_initialized = FALSE; - - if (!openssl_initialized) { - 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 && !defined(LIBRESSL_VERSION_NUMBER) - ENGINE_load_builtin_engines (); -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init (); -#else - OPENSSL_init_ssl (0, NULL); -#endif - -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_config (NULL); -#endif - if (RAND_status () == 0) { - guchar seed[128]; - - /* Try to use ottery to seed rand */ - ottery_rand_bytes (seed, sizeof (seed)); - RAND_seed (seed, sizeof (seed)); - rspamd_explicit_memzero (seed, sizeof (seed)); - } - - openssl_initialized = TRUE; - } -} - struct rspamd_external_libs_ctx * rspamd_init_libs (void) { |