treewide: centralize inclusion of libdnssec headers

Author: vcunat

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"

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"

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>

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>

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.
  */

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"

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"

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)

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)

lib/dnssec/signature.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <libdnssec/key.h>
+#include "lib/dnssec.h"
 #include <libknot/rrset.h>
 
 /**