Commit 1eb42dcf authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch '946-enable-fips-mode-option-breaks-build-of-hmacmd5-c-and-md5-c-v9_12' into 'v9_12'

Resolve "--enable-fips-mode option breaks build of  hmacmd5.c and md5.c"

See merge request !1733
parents 6b93eb8f 8ec09b90
Pipeline #12488 passed with stages
in 59 seconds
5192. [bug] configure --fips-mode failed. [GL #946]
--- 9.12.4 released ---
--- 9.12.4rc1 released ---
......
......@@ -24,10 +24,9 @@
#define UNIT_TESTING
#include <cmocka.h>
#include <isc/util.h>
#include <isc/mem.h>
#include <isc/print.h>
#include <isc/util.h>
#include <dns/rdatalist.h>
#include <dns/rdataset.h>
......@@ -580,7 +579,6 @@ algallocated_test(void **state) {
#ifndef PK11_MD5_DISABLE
assert_false(dns__tsig_algallocated(DNS_TSIG_HMACMD5_NAME));
#endif
assert_false(dns__tsig_algallocated(DNS_TSIG_HMACMD5_NAME));
assert_false(dns__tsig_algallocated(DNS_TSIG_HMACSHA1_NAME));
assert_false(dns__tsig_algallocated(DNS_TSIG_HMACSHA224_NAME));
assert_false(dns__tsig_algallocated(DNS_TSIG_HMACSHA256_NAME));
......
......@@ -406,5 +406,9 @@ isc_hmacmd5_check(int testing) {
}
#else /* !PK11_MD5_DISABLE */
#include <isc/util.h>
EMPTY_TRANSLATION_UNIT
#endif /* PK11_MD5_DISABLE */
......@@ -41,14 +41,13 @@
#include <isc/safe.h>
#include <isc/string.h>
#include <isc/types.h>
#include <isc/util.h>
#if PKCS11CRYPTO
#include <pk11/internal.h>
#include <pk11/pk11.h>
#endif
#include <isc/util.h>
#ifdef ISC_PLATFORM_OPENSSLHASH
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define EVP_MD_CTX_new() &(ctx->_ctx)
......@@ -382,5 +381,9 @@ isc_md5_check(bool testing) {
}
#else /* !PK11_MD5_DISABLE */
#include <isc/util.h>
EMPTY_TRANSLATION_UNIT
#endif /* PK11_MD5_DISABLE */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment