treewide: centralize inclusion of libdnssec headers

(cherry picked from commit d0375933dd0805e77ebe53765c51c8c8afa4a29e)

diff --git a/daemon/zimport.c b/daemon/zimport.c
index 197224b9b1d16747638a1fd0471bcb323af7b77c..424d833fddb0203363ca1fc0562b36678ff6ddc0 100644 (file)
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -32,12 +32,10 @@
 #include <libknot/rrset.h>
 #include <libzscanner/scanner.h>
 
-#include <libdnssec/digest.h>
 #if KNOT_VERSION_HEX < 0x030200
        #define KNOT_ZONEMD_ALGORITHM_SHA384 KNOT_ZONEMD_ALORITHM_SHA384
        #define KNOT_ZONEMD_ALGORITHM_SHA512 KNOT_ZONEMD_ALORITHM_SHA512
 #endif
-
 #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 305f36eb9ed5028f453bb0fa51b463a2ae90faef..ebc4b64a7188dbe7fad2e323fa6a4048f6553f16 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 eb4b33b1a0bb9869657a8732ea0c539edc2ed900..2a19c8fa9f6785adac9646eff2f750893a5130f4 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 ca737cfe126915f48e36e947945a4373aad3a2d7..107fe3477ad5e76591b9c299f76e587e04c03431 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 12ed09ed118a79de3ead27091d131de8c0094615..3dfc78a90fed2d04707f3b9b7bba9e8c73186477 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 13659c1b91b46f46cf196712042a94996322ee37..8dea8b60f198a6d273a9184040ec2ceb9bea4224 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/layer/validate.c b/lib/layer/validate.c
index ea613afcf16b4022f646719a4618e8564f409ea0..3dc29d7969df017a640c836a0c1e6b366629293b 100644 (file)
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -11,7 +11,6 @@
 #include <libknot/packet/wire.h>
 #include <libknot/rrtype/rdname.h>
 #include <libknot/rrtype/rrsig.h>
-#include <libdnssec/error.h>
 
 #include "lib/dnssec/nsec.h"
 #include "lib/dnssec/nsec3.h"