From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Mon, 16 May 2022 22:24:08 +0000 (+0100)
Subject: [Minor] Fix build with LibreSSL 3.5+
X-Git-Tag: 3.3~238
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7a357eded768fd4248214d95dac5b1216f7eb40e;p=rspamd.git

[Minor] Fix build with LibreSSL 3.5+

Submitted by: Bernard Spil
---

diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c
index 7c19a7805..e18658d88 100644
--- a/src/lua/lua_cryptobox.c
+++ b/src/lua/lua_cryptobox.c
@@ -1001,7 +1001,8 @@ lua_cryptobox_hash_dtor (struct rspamd_lua_cryptobox_hash *h)
 		EVP_MD_CTX_destroy (h->content.c);
 	}
 	else if (h->type == LUA_CRYPTOBOX_HASH_HMAC) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
 		HMAC_CTX_cleanup (h->content.hmac_c);
 		g_free (h->content.hmac_c);
 #else
@@ -1059,7 +1060,8 @@ rspamd_lua_ssl_hmac_create (struct rspamd_lua_cryptobox_hash *h, const EVP_MD *h
 {
 	h->type = LUA_CRYPTOBOX_HASH_HMAC;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
 	h->content.hmac_c = g_malloc0 (sizeof(*h->content.hmac_c));
 #else
 	h->content.hmac_c = HMAC_CTX_new ();
@@ -1461,7 +1463,8 @@ lua_cryptobox_hash_reset (lua_State *L)
 			EVP_DigestInit (h->content.c, EVP_MD_CTX_md (h->content.c));
 			break;
 		case LUA_CRYPTOBOX_HASH_HMAC:
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
 			/* Old openssl is awesome... */
 			HMAC_Init_ex (h->content.hmac_c, NULL, 0, h->content.hmac_c->md, NULL);
 #else