From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Wed, 7 Aug 2024 13:45:03 +0000 (+0100)
Subject: [Fix] Fix compatibility with OSSL 1.0
X-Git-Tag: 3.10.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1b3feb44e6ce7a8341ed003b7c286e29fe292e1;p=thirdparty%2Frspamd.git

[Fix] Fix compatibility with OSSL 1.0
---

diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
index 120c6ea10a..03b93b66b5 100644
--- a/src/libcryptobox/cryptobox.c
+++ b/src/libcryptobox/cryptobox.c
@@ -368,7 +368,7 @@ void rspamd_cryptobox_keypair(rspamd_pk_t pk, rspamd_sk_t sk,
 		OSSL_LIB_CTX_free(libctx);
 #else
 		const EC_POINT *ec_pub;
-		EC_GROUP *group;
+		const EC_GROUP *group;
 		const BIGNUM *bn_sec;
 
 		EC_KEY *ec_sec;
@@ -395,8 +395,6 @@ void rspamd_cryptobox_keypair(rspamd_pk_t pk, rspamd_sk_t sk,
 		len = BN_num_bytes(bn_sec);
 		g_assert(len <= (int) sizeof(rspamd_sk_t));
 		BN_bn2bin(bn_sec, sk);
-
-		EC_GROUP_free(group);
 #endif
 #endif
 	}
@@ -438,7 +436,7 @@ void rspamd_cryptobox_keypair_sig(rspamd_sig_pk_t pk, rspamd_sig_sk_t sk,
 		EC_KEY *ec_sec;
 		const BIGNUM *bn_sec;
 		const EC_POINT *ec_pub;
-		EC_GROUP *group;
+		const EC_GROUP *group;
 
 		ec_sec = EC_KEY_new_by_curve_name(CRYPTOBOX_CURVE_NID);
 		g_assert(ec_sec != NULL);
@@ -462,7 +460,6 @@ void rspamd_cryptobox_keypair_sig(rspamd_sig_pk_t pk, rspamd_sig_sk_t sk,
 		len = BN_num_bytes(bn_sec);
 		g_assert(len <= (int) sizeof(rspamd_sk_t));
 		BN_bn2bin(bn_sec, sk);
-		EC_GROUP_free(group);
 #endif
 
 #endif
diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index 50a55ebaa0..52ab09d952 100644
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -25,7 +25,6 @@
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/engine.h>
-#include <openssl/param_build.h>
 
 /* special DNS tokens */
 #define DKIM_DNSKEYNAME "_domainkey"