From: Aydın Mercan Date: Tue, 12 Aug 2025 09:51:38 +0000 (+0300) Subject: remove const qualifier in isc__crypto_* X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a12bf6b66e9079eb17191141f79aa614bd71ac;p=thirdparty%2Fbind9.git remove const qualifier in isc__crypto_* The `EVP_MD *` pointers assigned with `EVP_MD_fetch` aren't const qualified, adding a correctness issue. --- diff --git a/lib/isc/crypto.c b/lib/isc/crypto.c index 9e4347794f7..ad5156c3647 100644 --- a/lib/isc/crypto.c +++ b/lib/isc/crypto.c @@ -33,12 +33,12 @@ static isc_mem_t *isc__crypto_mctx = NULL; static OSSL_PROVIDER *base = NULL, *fips = NULL; #endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ -const EVP_MD *isc__crypto_md5 = NULL; -const EVP_MD *isc__crypto_sha1 = NULL; -const EVP_MD *isc__crypto_sha224 = NULL; -const EVP_MD *isc__crypto_sha256 = NULL; -const EVP_MD *isc__crypto_sha384 = NULL; -const EVP_MD *isc__crypto_sha512 = NULL; +EVP_MD *isc__crypto_md5 = NULL; +EVP_MD *isc__crypto_sha1 = NULL; +EVP_MD *isc__crypto_sha224 = NULL; +EVP_MD *isc__crypto_sha256 = NULL; +EVP_MD *isc__crypto_sha384 = NULL; +EVP_MD *isc__crypto_sha512 = NULL; #if OPENSSL_VERSION_NUMBER >= 0x30000000L #define md_register_algorithm(alg, algname) \ @@ -50,12 +50,12 @@ const EVP_MD *isc__crypto_sha512 = NULL; } \ } -#define md_unregister_algorithm(alg) \ - { \ - if (isc__crypto_##alg != NULL) { \ - EVP_MD_free(UNCONST(isc__crypto_##alg)); \ - isc__crypto_##alg = NULL; \ - } \ +#define md_unregister_algorithm(alg) \ + { \ + if (isc__crypto_##alg != NULL) { \ + EVP_MD_free(isc__crypto_##alg); \ + isc__crypto_##alg = NULL; \ + } \ } #else /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ #define md_register_algorithm(alg, algname) \ diff --git a/lib/isc/include/isc/crypto.h b/lib/isc/include/isc/crypto.h index 14bdd469331..a7dc9f45a4d 100644 --- a/lib/isc/include/isc/crypto.h +++ b/lib/isc/include/isc/crypto.h @@ -17,12 +17,12 @@ #include -extern const EVP_MD *isc__crypto_md5; -extern const EVP_MD *isc__crypto_sha1; -extern const EVP_MD *isc__crypto_sha224; -extern const EVP_MD *isc__crypto_sha256; -extern const EVP_MD *isc__crypto_sha384; -extern const EVP_MD *isc__crypto_sha512; +extern EVP_MD *isc__crypto_md5; +extern EVP_MD *isc__crypto_sha1; +extern EVP_MD *isc__crypto_sha224; +extern EVP_MD *isc__crypto_sha256; +extern EVP_MD *isc__crypto_sha384; +extern EVP_MD *isc__crypto_sha512; bool isc_crypto_fips_mode(void);