treewide: centralize inclusion of libdnssec headers

diff --git a/daemon/ratelimiting.test/tests.inc.c b/daemon/ratelimiting.test/tests.inc.c
index 1434ee47ae6a729da47bee8696f33d4d0f26d855..e1854cb386484abd2703a76308fea9c39171952a 100644 (file)
--- a/daemon/ratelimiting.test/tests.inc.c
+++ b/daemon/ratelimiting.test/tests.inc.c
@@ -20,8 +20,7 @@
 #include <stdatomic.h>
 
 #include "tests/unit/test.h"
-#include "libdnssec/crypto.h"
-#include "libdnssec/random.h"
+#include "lib/dnssec.h"
 #include "libknot/libknot.h"
 #include "contrib/openbsd/siphash.h"
 #include "lib/resolve.h"

diff --git a/daemon/zimport.c b/daemon/zimport.c
index 2f546354b313f89c553848a936937f613ae7257d..99ec1f914ce682fc1a72a050cbfe91e284faf42a 100644 (file)
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -32,8 +32,6 @@
 #include <libknot/rrset.h>
 #include <libzscanner/scanner.h>
 
-#include <libdnssec/digest.h>
-
 #include "daemon/worker.h"
 #include "lib/dnssec/ta.h"
 #include "lib/dnssec.h"

diff --git a/lib/cache/impl.h b/lib/cache/impl.h
index c585ef6a4a4be3b9488bf2ea42bd64d4d741ef30..bafaecf59416fa16e23dd0dc99eb4d2fa99761b0 100644 (file)
--- a/lib/cache/impl.h
+++ b/lib/cache/impl.h
@@ -11,8 +11,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libdnssec/error.h>
-#include <libdnssec/nsec.h>
+#include "lib/dnssec.h"
 #include <libknot/consts.h>
 #include <libknot/db/db.h>
 #include <libknot/dname.h>

diff --git a/lib/dnssec.c b/lib/dnssec.c
index 169ce2bf7046d8357ccf787506101c7444984572..67e91fd1129030b71dd0d7546fdbc6c4d0988784 100644 (file)
--- a/lib/dnssec.c
+++ b/lib/dnssec.c
@@ -2,11 +2,6 @@
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <libdnssec/binary.h>
-#include <libdnssec/crypto.h>
-#include <libdnssec/error.h>
-#include <libdnssec/key.h>
-#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/wire.h>
 #include <libknot/rdataset.h>

diff --git a/lib/dnssec.h b/lib/dnssec.h
index b9f854d0619168596ede95b0e49c61f6519735a0..8bafaa9ce310683da1965eda7b35dca057e59388 100644 (file)
--- a/lib/dnssec.h
+++ b/lib/dnssec.h
@@ -8,6 +8,10 @@
 #include "lib/utils.h"
 #include <libknot/packet/pkt.h>
 
+// This is the central place in Knot Resolver which includes the (former) libdnssec.
+#include <libdnssec/dnssec.h>
+#include <libdnssec/digest.h>
+
 /**
  * Initialise cryptographic back-end.
  */

diff --git a/lib/dnssec/nsec.c b/lib/dnssec/nsec.c
index 07672cc8c7a2e33a70e16b9769dee90a6a41c678..0f1c11f7f71e82a6b24e1edae1b0b5b83deb1a4f 100644 (file)
--- a/lib/dnssec/nsec.c
+++ b/lib/dnssec/nsec.c
@@ -10,10 +10,9 @@
 #include <libknot/rrset.h>
 #include <libknot/rrtype/nsec.h>
 #include <libknot/rrtype/rrsig.h>
-#include <libdnssec/error.h>
-#include <libdnssec/nsec.h>
 
 #include "lib/defines.h"
+#include "lib/dnssec.h"
 #include "lib/dnssec/nsec.h"
 #include "lib/utils.h"
 #include "lib/resolve.h"

diff --git a/lib/dnssec/nsec3.c b/lib/dnssec/nsec3.c
index 7db93dc5872ab3cf819a28f09d23bd8c881f753f..2e9363d10aea2519b4c807da072e8c89dc0990ba 100644 (file)
--- a/lib/dnssec/nsec3.c
+++ b/lib/dnssec/nsec3.c
@@ -4,15 +4,13 @@
 
 #include <string.h>
 
-#include <libdnssec/binary.h>
-#include <libdnssec/error.h>
-#include <libdnssec/nsec.h>
 #include <libknot/descriptor.h>
 #include <contrib/base32hex.h>
 #include <libknot/rrset.h>
 #include <libknot/rrtype/nsec3.h>
 
 #include "lib/defines.h"
+#include "lib/dnssec.h"
 #include "lib/dnssec/nsec.h"
 #include "lib/dnssec/nsec3.h"
 #include "lib/utils.h"

diff --git a/lib/dnssec/nsec3.h b/lib/dnssec/nsec3.h
index 1a3a6d60be89a2ca065757f7403aea25477dab8b..3ecac8bc480d84063ce9317bd780588fc20fb636 100644 (file)
--- a/lib/dnssec/nsec3.h
+++ b/lib/dnssec/nsec3.h
@@ -6,7 +6,7 @@
 
 #include <libknot/packet/pkt.h>
 #include <libknot/rrtype/nsec3.h>
-#include <libdnssec/nsec.h>
+#include "lib/dnssec.h"
 
 
 static inline unsigned int kr_nsec3_price(unsigned int iterations, unsigned int salt_len)

diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c
index 6e443cf95f76a773308e7b053f27634025333533..b2ef2d5509799e60f143f4307113ec1b6aa63d79 100644 (file)
--- a/lib/dnssec/signature.c
+++ b/lib/dnssec/signature.c
@@ -5,9 +5,6 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include <libdnssec/error.h>
-#include <libdnssec/key.h>
-#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/rrset-wire.h>
 #include <libknot/packet/wire.h>
@@ -18,6 +15,7 @@
 
 #include "lib/defines.h"
 #include "lib/utils.h"
+#include "lib/dnssec.h"
 #include "lib/dnssec/signature.h"
 
 static int authenticate_ds(const dnssec_key_t *key, dnssec_binary_t *ds_rdata, uint8_t digest_type)

diff --git a/lib/dnssec/signature.h b/lib/dnssec/signature.h
index 1cc6c8f61dc7a948eff126011adddf217b35d895..4d193efbfb8e68ea21c1ab7a0118f455a4aaac93 100644 (file)
--- a/lib/dnssec/signature.h
+++ b/lib/dnssec/signature.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <libdnssec/key.h>
+#include "lib/dnssec.h"
 #include <libknot/rrset.h>
 
 /**

diff --git a/lib/dnssec/ta.c b/lib/dnssec/ta.c
index 6593b2f32eac4f8f044b1ca5dfa167625d02e567..af53e2ed9f7d684982fde6b811fa56f0379e7d32 100644 (file)
--- a/lib/dnssec/ta.c
+++ b/lib/dnssec/ta.c
@@ -7,8 +7,6 @@
 #include <libknot/rdataset.h>
 #include <libknot/rrset.h>
 #include <libknot/packet/wire.h>
-#include <libdnssec/key.h>
-#include <libdnssec/error.h>
 
 #include "lib/defines.h"
 #include "lib/dnssec.h"

diff --git a/lib/kru.inc.c b/lib/kru.inc.c
index cf23516b5f4a318a962e82815490c2e6e29fcdae..6526c6305760f481305ef38d3a9d3ee435d435a3 100644 (file)
--- a/lib/kru.inc.c
+++ b/lib/kru.inc.c
@@ -50,8 +50,10 @@ Size (`loads_bits` = log2 length):
 
 #include "./kru.h"
 #include "contrib/ucw/lib.h"
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+
+// We only need the original libdnssec here, but...
+#include "lib/dnssec.h"
+
 #if USE_AES
        /// 4-8 rounds should be an OK choice, most likely.
        #define AES_ROUNDS 4

diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 549d99a821e1c3283ce2ac0815699a982b3467cf..0d4f4462aa8cbf07c9a8029309e790fe33b839d4 100644 (file)
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -11,8 +11,6 @@
 #include <libknot/packet/wire.h>
 #include <libknot/rrtype/rdname.h>
 #include <libknot/rrtype/rrsig.h>
-#include <libdnssec/error.h>
-#include <libdnssec/key.h>
 
 #include "lib/dnssec/nsec.h"
 #include "lib/dnssec/nsec3.h"