From 2420320b96e95ee7d644daece7c691ac408159aa Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 14 May 2018 11:52:54 +1000
Subject: [PATCH 1/2] return untested if not built with OPENSSL or PKCS11CRYPTO

---
 lib/dns/tests/sigs_test.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 90f513aa62..daf3f1c844 100644
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -15,6 +15,9 @@
 
 #include <atf-c.h>
 
+#include <isc/util.h>
+
+#if defined(OPENSSL) || defined(PKCS11CRYPTO)
 #include <dns/dnssec.h>
 #include <dns/rdatatype.h>
 #include <dns/zone.h>
@@ -435,9 +438,23 @@ ATF_TC_BODY(updatesigs, tc) {
 
 	dns_test_end();
 }
+#else
+ATF_TC(untested);
+ATF_TC_HEAD(untested, tc) {
+        atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
+}
+ATF_TC_BODY(untested, tc) {
+        UNUSED(tc);
+        atf_tc_skip("DNSSEC support not compiled in");
+}
+#endif
 
 ATF_TP_ADD_TCS(tp) {
+#if defined(OPENSSL) || defined(PKCS11CRYPTO)
 	ATF_TP_ADD_TC(tp, updatesigs);
+#else
+	ATF_TP_ADD_TC(tp, untested);
+#endif
 
 	return (atf_no_error());
 }

From f98e145c5bc50afbacefd230c0097f5f799d7692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 14 May 2018 08:55:50 +0200
Subject: [PATCH 2/2] Extend the list of headers included by
 lib/dns/tests/sigs_test.c

---
 lib/dns/tests/sigs_test.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index daf3f1c844..f345b3c47b 100644
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -18,10 +18,29 @@
 #include <isc/util.h>
 
 #if defined(OPENSSL) || defined(PKCS11CRYPTO)
+#include <string.h>
+
+#include <dns/db.h>
+#include <dns/diff.h>
 #include <dns/dnssec.h>
+#include <dns/fixedname.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
+#include <dns/result.h>
+#include <dns/types.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
+#include <isc/buffer.h>
+#include <isc/list.h>
+#include <isc/region.h>
+#include <isc/stdtime.h>
+#include <isc/result.h>
+#include <isc/types.h>
+
 #include "../zone_p.h"
 
 #include "dnstest.h"