]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Fix] Fix compatibility with OSSL 1.0
authorVsevolod Stakhov <vsevolod@rspamd.com>
Wed, 7 Aug 2024 13:45:03 +0000 (14:45 +0100)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Wed, 7 Aug 2024 13:45:03 +0000 (14:45 +0100)
src/libcryptobox/cryptobox.c
src/libserver/dkim.c

index 120c6ea10af5d02fed280b3f60babc2f627ab6b9..03b93b66b5f751b7c04806e3ea21aa92fcf9d6ac 100644 (file)
@@ -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
index 50a55ebaa04ef469f137e9cc455fabbd9231a783..52ab09d952be383ab1ca6cb195ebbd87eb14be0b 100644 (file)
@@ -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"