add #include <isc/util.h>

(cherry picked from commit 98a37c9aba90052424a2629667edf344fd9d786c)

diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c
index 0b2cd14d120876e35cec5ddc5c1f37e4ce77b0b0..107eb87b8f0eba5522d54fc4031007913ad0a3dd 100644 (file)
--- a/lib/dns/tests/tsig_test.c
+++ b/lib/dns/tests/tsig_test.c
@@ -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));

diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 0031afb024cff9baca2fb320d269a5d52f5a2363..2e72c4db9a1fff578460011c29ea7548d149f179 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -406,5 +406,9 @@ isc_hmacmd5_check(int testing) {
 }
 
 #else /* !PK11_MD5_DISABLE */
+
+#include <isc/util.h>
+
 EMPTY_TRANSLATION_UNIT
+
 #endif /* PK11_MD5_DISABLE */

diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index 920aed5f5881df49cde53b65eabac435df9967a3..249f3da2f2546b2c71ad0dbe3afe1202c77670c3 100644 (file)
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -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 */