add #include <isc/util.h>

diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c
index 4d6847ed090f5434726c7c475f4718471022bdb2..8e5250e72a14185c56fabeba0e9cc93b5602072e 100644 (file)
--- a/lib/dns/tests/tsig_test.c
+++ b/lib/dns/tests/tsig_test.c
@@ -28,7 +28,6 @@
 #include <isc/print.h>
 #include <isc/util.h>
 
-
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>
 #include <dns/tsig.h>

diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 0423762ca4656809fade9fd976da7163c8d0b91e..2e72c4db9a1fff578460011c29ea7548d149f179 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hmacmd5.c,v 1.16 2009/02/06 23:47:42 tbox Exp $ */
-
 /*! \file
  * This code implements the HMAC-MD5 keyed hash algorithm
  * described in RFC2104.
@@ -408,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 */