diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-11-18 10:51:56 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-11-18 10:51:56 +0000 |
| commit | f77a42d79e636b1c08b31a99d32d92e7aad88bda (patch) | |
| tree | 9e32eb4e267890616d07fc70da22e4252b5323d4 /src | |
| parent | a1bac50090b1742f09cac1b3a1eb55b8de62ded9 (diff) | |
| download | rspamd-f77a42d79e636b1c08b31a99d32d92e7aad88bda.tar.gz rspamd-f77a42d79e636b1c08b31a99d32d92e7aad88bda.zip | |
[Minor] More fixes for bloody openssl 1.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/libutil/util.c | 2 | ||||
| -rw-r--r-- | src/lua/lua_cryptobox.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libutil/util.c b/src/libutil/util.c index 2538fb57a..080cbd142 100644 --- a/src/libutil/util.c +++ b/src/libutil/util.c @@ -2070,7 +2070,9 @@ rspamd_init_libs (void) OPENSSL_init_ssl (0, NULL); #endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) OPENSSL_config (NULL); +#endif if (RAND_poll () == 0) { guchar seed[128]; diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c index c4b90af45..94dec34f5 100644 --- a/src/lua/lua_cryptobox.c +++ b/src/lua/lua_cryptobox.c @@ -1025,7 +1025,11 @@ lua_cryptobox_hash_gc (lua_State *L) struct rspamd_lua_cryptobox_hash *h = lua_check_cryptobox_hash (L, 1); if (h->is_ssl) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) EVP_MD_CTX_cleanup (h->c); +#else + EVP_MD_CTX_reset (h->c); +#endif EVP_MD_CTX_destroy (h->c); } else { |