Update libdnssec -> libknot/dnssec includes

src/knot/conf/schema.c

@@ -15,8 +15,8 @@
 #include "knot/updates/acl.h"
 #include "knot/zone/zone-load.h"
 #include "libknot/rrtype/opt.h"
-#include "libdnssec/tsig.h"
-#include "libdnssec/key.h"
+#include "libknot/dnssec/tsig.h"
+#include "libknot/dnssec/key.h"
 
 #define HOURS(x)	((x) * 3600)
 #define DAYS(x)		((x) * HOURS(24))

src/knot/conf/tools.c

@@ -21,7 +21,7 @@
 #include <linux/udp.h>
 #endif
 
-#include "libdnssec/key.h"
+#include "libknot/dnssec/key.h"
 #include "knot/catalog/catalog_db.h"
 #include "knot/conf/tools.h"
 #include "knot/conf/conf.h"

src/knot/dnssec/context.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "libdnssec/keystore.h"
+#include "libknot/dnssec/keystore.h"
 #include "contrib/spinlock.h"
 #include "contrib/time.h"
 #include "knot/conf/conf.h"

src/knot/dnssec/kasp/kasp_zone.c

@@ -6,7 +6,7 @@
 #include "knot/dnssec/kasp/kasp_zone.h"
 #include "knot/dnssec/kasp/keystore.h"
 #include "knot/dnssec/zone-keys.h"
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 
 // FIXME DNSSEC errors versus knot errors
 

src/knot/dnssec/kasp/kasp_zone.h

@@ -7,7 +7,7 @@
 
 #include "knot/dnssec/kasp/kasp_db.h"
 #include "knot/zone/contents.h"
-#include "libdnssec/keystore.h"
+#include "libknot/dnssec/keystore.h"
 
 typedef struct {
 	knot_dname_t *dname;

src/knot/dnssec/kasp/keystore.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "knot/dnssec/kasp/keystore.h"
 #include "knot/conf/schema.h"
 #include "libknot/error.h"

src/knot/dnssec/kasp/keystore.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "libdnssec/keystore.h"
+#include "libknot/dnssec/keystore.h"
 
 int keystore_load(const char *config, unsigned backend,
                   const char *kasp_base_path, dnssec_keystore_t **keystore);

src/knot/dnssec/kasp/policy.h

@@ -8,8 +8,8 @@
 #include <stdbool.h>
 
 #include "contrib/time.h"
-#include "libdnssec/key.h"
-#include "libdnssec/keystore.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keystore.h"
 #include "knot/conf/conf.h"
 
 /*!

src/knot/dnssec/key-events.c

@@ -13,7 +13,7 @@
 #include "knot/dnssec/policy.h"
 #include "knot/dnssec/zone-keys.h"
 #include "knot/zone/serial.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 
 static bool not_removed(const knot_kasp_key_t *key, knot_time_t now)
 {

src/knot/dnssec/key_records.c

@@ -5,8 +5,8 @@
 
 #include "knot/dnssec/key_records.h"
 
-#include "libdnssec/error.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/sign.h"
 #include "knot/dnssec/rrset-sign.h"
 #include "knot/dnssec/zone-sign.h"
 #include "knot/journal/serialization.h"

src/knot/dnssec/nsec-chain.h

@@ -11,7 +11,7 @@
 
 #include "knot/zone/contents.h"
 #include "knot/updates/zone-update.h"
-#include "libdnssec/nsec.h"
+#include "libknot/dnssec/nsec.h"
 
 /*!
  * \brief Parameters to be used in connect_nsec_nodes callback.

src/knot/dnssec/nsec3-chain.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "libdnssec/nsec.h"
+#include "libknot/dnssec/nsec.h"
 #include "knot/updates/changesets.h"
 #include "knot/updates/zone-update.h"
 #include "knot/zone/contents.h"

src/knot/dnssec/rrset-sign.c

@@ -6,7 +6,7 @@
 #include <assert.h>
 
 #include "contrib/wire_ctx.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "knot/dnssec/rrset-sign.h"
 #include "knot/dnssec/zone-sign.h"
 #include "knot/zone/serial.h" // DNS uint32 arithmetics

src/knot/dnssec/rrset-sign.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "libdnssec/key.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/sign.h"
 #include "knot/dnssec/context.h"
 #include "knot/dnssec/zone-keys.h"
 #include "libknot/rrset.h"

src/knot/dnssec/zone-events.c

@@ -5,8 +5,8 @@
 
 #include <assert.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/libknot.h"
 #include "knot/conf/conf.h"
 #include "knot/common/dbus.h"

src/knot/dnssec/zone-keys.c

@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "knot/common/log.h"
 #include "knot/dnssec/zone-keys.h"
 #include "libknot/libknot.h"

src/knot/dnssec/zone-keys.h

@@ -6,8 +6,8 @@
 #pragma once
 
 #include "libknot/dynarray.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/sign.h"
 #include "knot/dnssec/kasp/kasp_zone.h"
 #include "knot/dnssec/kasp/policy.h"
 #include "knot/dnssec/context.h"

src/knot/dnssec/zone-nsec.c

@@ -5,7 +5,7 @@
 
 #include <assert.h>
 
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "libknot/descriptor.h"
 #include "libknot/rrtype/nsec3.h"
 #include "libknot/rrtype/soa.h"

src/knot/dnssec/zone-sign.c

@@ -7,10 +7,10 @@
 #include <pthread.h>
 #include <sys/types.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/keytag.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keytag.h"
+#include "libknot/dnssec/sign.h"
 #include "knot/common/log.h"
 #include "knot/dnssec/key-events.h"
 #include "knot/dnssec/key_records.h"

src/knot/events/handlers/dnskey_sync.c

@@ -12,7 +12,7 @@
 #include "knot/server/server.h"
 #include "knot/zone/serial.h"
 #include "knot/zone/zone.h"
-#include "libdnssec/keytag.h"
+#include "libknot/dnssec/keytag.h"
 #include "libknot/errcode.h"
 
 #define DNSKEY_SYNC_LOG(priority, zone, remote, flags, fmt, ...) \

src/knot/events/handlers/refresh.c

@@ -8,7 +8,7 @@
 #include <urcu.h>
 
 #include "contrib/mempattern.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "knot/common/log.h"
 #include "knot/conf/conf.h"
 #include "knot/dnssec/zone-events.h"

src/knot/events/handlers/update.c

@@ -15,7 +15,7 @@
 #include "knot/updates/ddns.h"
 #include "knot/zone/digest.h"
 #include "knot/zone/zone.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/libknot.h"
 #include "libknot/quic/quic_conn.h"
 #include "libknot/quic/quic.h"

src/knot/modules/cookies/cookies.c

@@ -12,7 +12,7 @@
 #include "contrib/atomic.h"
 #include "contrib/threads.h"
 #include "contrib/string.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 
 #define BADCOOKIE_CTR_INIT	1
 

src/knot/modules/geoip/geoip.c

@@ -17,7 +17,7 @@
 #include "contrib/sockaddr.h"
 #include "contrib/string.h"
 #include "contrib/strtonum.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "libzscanner/scanner.h"
 
 #define MOD_CONFIG_FILE	"\x0B""config-file"

src/knot/modules/onlinesign/onlinesign.c

@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include "contrib/string.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "knot/include/module.h"
 #include "knot/modules/onlinesign/nsec_next.h"
 // Next dependencies force static module!

src/knot/modules/rrl/functions.c

@@ -12,7 +12,7 @@
 #include "contrib/musl/inet_ntop.h"
 #include "contrib/sockaddr.h"
 #include "contrib/time.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 
 // CIDR block prefix lengths for v4/v6 (hardcoded also in unit tests).
 #define RRL_V4_PREFIXES  (uint8_t[])       {  18,  20, 24, 32 }

src/knot/modules/rrl/kru.inc.c

@@ -39,8 +39,8 @@ Size (`loads_bits` = log2 length):
 
 #include "./kru.h"
 #include "contrib/macros.h"
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 typedef uint64_t hash_t;
 #if USE_AES
 	/// 4-8 rounds should be an OK choice, most likely.

src/knot/nameserver/notify.c

@@ -10,7 +10,7 @@
 #include "knot/nameserver/log.h"
 #include "knot/nameserver/tsig_ctx.h"
 #include "knot/zone/serial.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/libknot.h"
 
 #define NOTIFY_IN_LOG(priority, qdata, fmt...) \

src/knot/nameserver/process_query.c

@@ -5,7 +5,7 @@
 
 #include <urcu.h>
 
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/tsig.h"
 #include "knot/common/log.h"
 #include "knot/dnssec/rrset-sign.h"
 #include "knot/nameserver/process_query.h"

src/knot/query/query.c

@@ -6,7 +6,7 @@
 #include "knot/query/query.h"
 
 #include "contrib/wire_ctx.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 
 void query_init_pkt(knot_pkt_t *pkt)
 {

src/knot/zone/adjust.c

@@ -8,7 +8,7 @@
 #include "knot/dnssec/zone-nsec.h"
 #include "knot/zone/adds_tree.h"
 #include "knot/zone/measure.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 
 static bool node_non_dnssec_exists(const zone_node_t *node)
 {

src/knot/zone/backup.c

@@ -28,7 +28,7 @@
 #include "knot/server/server.h"
 #include "knot/zone/backup_dir.h"
 #include "knot/zone/zonefile.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 
 // Current backup format version for output. Don't decrease it.
 #define BACKUP_VERSION BACKUP_FORMAT_2  // Starting with release 3.1.0.

src/knot/zone/contents.c

@@ -5,7 +5,7 @@
 
 #include <assert.h>
 
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "knot/zone/adds_tree.h"
 #include "knot/zone/adjust.h"
 #include "knot/zone/contents.h"

src/knot/zone/contents.h

@@ -8,7 +8,7 @@
 #include <pthread.h>
 
 #include "contrib/atomic.h"
-#include "libdnssec/nsec.h"
+#include "libknot/dnssec/nsec.h"
 #include "libknot/rrtype/nsec3param.h"
 #include "knot/zone/node.h"
 #include "knot/zone/zone-tree.h"

src/knot/zone/digest.c

@@ -9,7 +9,7 @@
 #include "knot/dnssec/rrset-sign.h"
 #include "knot/updates/zone-update.h"
 #include "contrib/wire_ctx.h"
-#include "libdnssec/digest.h"
+#include "libknot/dnssec/digest.h"
 #include "libknot/libknot.h"
 
 #define DIGEST_BUF_MIN 4096

src/knot/zone/semantic-check.c

@@ -7,8 +7,8 @@
 
 #include "knot/zone/semantic-check.h"
 
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
 #include "contrib/string.h"
 #include "libknot/libknot.h"
 #include "knot/dnssec/key-events.h"

src/libknot/codes.c

@@ -7,7 +7,7 @@
 #include "libknot/codes.h"
 #include "libknot/consts.h"
 #include "libknot/rrtype/opt.h"
-#include "libdnssec/key.h"
+#include "libknot/dnssec/key.h"
 
 _public_
 const knot_lookup_t knot_opcode_names[] = {

src/libknot/dnssec/binary.c

@@ -7,9 +7,9 @@
 #include <string.h>
 
 #include "contrib/base64.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /* -- public API ----------------------------------------------------------- */
 

src/libknot/dnssec/crypto.c

@@ -6,9 +6,9 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/pkcs11.h>
 
-#include "libdnssec/crypto.h"
-#include "libdnssec/p11/p11.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/p11/p11.h"
+#include "libknot/dnssec/shared/shared.h"
 
 _public_
 void dnssec_crypto_init(void)

src/libknot/dnssec/digest.c

@@ -3,12 +3,12 @@
  *  For more information, see <https://www.knot-dns.cz/>
  */
 
-#include "libdnssec/digest.h"
+#include "libknot/dnssec/digest.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/shared/shared.h"
 
 struct dnssec_digest_ctx {
 	gnutls_hash_hd_t gtctx;

src/libknot/dnssec/digest.h

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
 
 typedef enum {
 	DNSSEC_DIGEST_INVALID = 0,

src/libknot/dnssec/dnssec.h

@@ -11,15 +11,15 @@
 
 #pragma once
 
-#include <libdnssec/binary.h>
-#include <libdnssec/crypto.h>
-#include <libdnssec/error.h>
-#include <libdnssec/key.h>
-#include <libdnssec/keyid.h>
-#include <libdnssec/keystore.h>
-#include <libdnssec/keytag.h>
-#include <libdnssec/nsec.h>
-#include <libdnssec/pem.h>
-#include <libdnssec/random.h>
-#include <libdnssec/sign.h>
-#include <libdnssec/tsig.h>
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keytag.h"
+#include "libknot/dnssec/nsec.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/random.h"
+#include "libknot/dnssec/sign.h"
+#include "libknot/dnssec/tsig.h"

src/libknot/dnssec/error.c

@@ -5,8 +5,8 @@
 
 #include <string.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/shared/shared.h"
 
 typedef struct error_message_t {
 	int code;

src/libknot/dnssec/key.h

@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * DNSKEY algorithm numbers.

src/libknot/dnssec/key/algorithm.c

@@ -5,10 +5,10 @@
 
 #include <gnutls/gnutls.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /* -- internal ------------------------------------------------------------- */
 

src/libknot/dnssec/key/algorithm.h

@@ -7,7 +7,7 @@
 
 #include <gnutls/gnutls.h>
 
-#include "libdnssec/key.h"
+#include "libknot/dnssec/key.h"
 
 /*!
  * Convert DNSKEY algorithm identifier to GnuTLS identifier.

src/libknot/dnssec/key/convert.c

@@ -10,14 +10,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "libdnssec/shared/bignum.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/shared/bignum.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 /* -- wrappers for GnuTLS types -------------------------------------------- */
 

src/libknot/dnssec/key/convert.h

@@ -7,8 +7,8 @@
 
 #include <gnutls/abstract.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/key.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/key.h"
 
 /*!
  * Encode public key into the format used in DNSKEY RDATA.

src/libknot/dnssec/key/dnskey.c

@@ -3,11 +3,11 @@
  *  For more information, see <https://www.knot-dns.cz/>
  */
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/key/convert.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/key/convert.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 /* -- internal API --------------------------------------------------------- */
 

src/libknot/dnssec/key/dnskey.h

@@ -7,8 +7,8 @@
 
 #include <gnutls/abstract.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
 
 /*!
  * DNSKEY RDATA fields offsets.

src/libknot/dnssec/key/ds.c

@@ -3,13 +3,13 @@
  *  For more information, see <https://www.knot-dns.cz/>
  */
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/shared/dname.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/shared/dname.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

src/libknot/dnssec/key/internal.h

@@ -8,8 +8,8 @@
 #include <gnutls/abstract.h>
 #include <stdint.h>
 
-#include "libdnssec/key.h"
-#include "libdnssec/shared/dname.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/shared/dname.h"
 
 /*!
  * DNSSEC key.

src/libknot/dnssec/key/key.c

@@ -9,18 +9,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/key/convert.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/shared/keyid_gnutls.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/keytag.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/key/convert.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/shared/keyid_gnutls.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keytag.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 #include "contrib/wire_ctx.h"
 
 /*!

src/libknot/dnssec/key/keytag.c

@@ -7,10 +7,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /*!
  * Compute keytag for RSA/MD5 key.

src/libknot/dnssec/key/privkey.c

@@ -6,15 +6,15 @@
 #include <gnutls/abstract.h>
 #include <gnutls/gnutls.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/key/convert.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/key/privkey.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/key/convert.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/key/privkey.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 /* -- internal functions --------------------------------------------------- */
 

src/libknot/dnssec/key/privkey.h

@@ -7,7 +7,7 @@
 
 #include <gnutls/abstract.h>
 
-#include "libdnssec/key.h"
+#include "libknot/dnssec/key.h"
 
 /*!
  * Load a private key into a DNSSEC key, create a public part if necessary.

src/libknot/dnssec/key/simple.c

@@ -6,14 +6,14 @@
 #include <gnutls/abstract.h>
 #include <gnutls/gnutls.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/key/privkey.h"
-#include "libdnssec/pem.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/key/privkey.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /* -- public API ----------------------------------------------------------- */
 

src/libknot/dnssec/keyid.c

@@ -6,9 +6,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/keyid.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/shared/shared.h"
 
 #include "contrib/ctype.h"
 #include "contrib/tolower.h"

src/libknot/dnssec/keystore.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <libdnssec/binary.h>
-#include <libdnssec/key.h>
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/key.h"
 
 struct dnssec_keystore;
 

src/libknot/dnssec/keystore/internal.h

@@ -8,9 +8,9 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/abstract.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/key.h"
-#include "libdnssec/keystore.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keystore.h"
 
 typedef struct keystore_functions {
 	// construction of internal context

src/libknot/dnssec/keystore/keystore.c

@@ -6,16 +6,16 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/key/dnskey.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/key/privkey.h"
-#include "libdnssec/keyid.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/keystore/internal.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/key/dnskey.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/key/privkey.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keystore/internal.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /* -- internal API --------------------------------------------------------- */
 

src/libknot/dnssec/keystore/pkcs11.c

@@ -7,14 +7,14 @@
 #include <pthread.h>
 
 #include "contrib/string.h"
-#include "libdnssec/error.h"
-#include "libdnssec/keyid.h"
-#include "libdnssec/shared/keyid_gnutls.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/keystore/internal.h"
-#include "libdnssec/p11/p11.h"
-#include "libdnssec/pem.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/shared/keyid_gnutls.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keystore/internal.h"
+#include "libknot/dnssec/p11/p11.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/shared/shared.h"
 
 #ifdef ENABLE_PKCS11
 

src/libknot/dnssec/keystore/pkcs8.c

@@ -12,13 +12,13 @@
 #include <sys/types.h>
 
 #include "contrib/files.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/keystore/internal.h"
-#include "libdnssec/pem.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/keyid_gnutls.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/keystore/internal.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/keyid_gnutls.h"
 
 #define DIR_INIT_MODE 0750
 

src/libknot/dnssec/keytag.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * Compute a key tag for a DNSSEC key.

src/libknot/dnssec/nsec.h

@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * DNSSEC NSEC3 algorithm numbers.

src/libknot/dnssec/nsec/bitmap.c

@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "libdnssec/nsec.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/nsec.h"
+#include "libknot/dnssec/shared/shared.h"
 
 #define BITMAP_WINDOW_SIZE 256
 #define BITMAP_WINDOW_BYTES (BITMAP_WINDOW_SIZE/CHAR_BIT)

src/libknot/dnssec/nsec/hash.c

@@ -8,9 +8,9 @@
 #include <gnutls/crypto.h>
 #include <string.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/nsec.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/nsec.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /*!
  * Compute NSEC3 hash for given data and algorithm.

src/libknot/dnssec/nsec/nsec.c

@@ -3,12 +3,12 @@
  *  For more information, see <https://www.knot-dns.cz/>
  */
 
-#include "libdnssec/nsec.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/nsec.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
 
 /*!
  * Free NSEC3 parameters.

src/libknot/dnssec/p11/p11.c

@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libdnssec/p11/p11.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/p11/p11.h"
+#include "libknot/dnssec/error.h"
 
 #ifdef ENABLE_PKCS11
 

src/libknot/dnssec/pem.c

@@ -8,11 +8,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/pem.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/shared/shared.h"
 
 _public_
 int dnssec_pem_to_x509(const dnssec_binary_t *pem, gnutls_x509_privkey_t *key)

src/libknot/dnssec/pem.h

@@ -17,7 +17,7 @@
 
 #include <gnutls/gnutls.h>
 
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * Create GnuTLS X.509 private key from unencrypted PEM data.

src/libknot/dnssec/random.c

@@ -9,9 +9,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /* -- public API ----------------------------------------------------------- */
 

src/libknot/dnssec/random.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * Fill a buffer with pseudo-random data.

src/libknot/dnssec/sample_keys.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 
 typedef struct key_parameters {
 	// DNSSEC fields

src/libknot/dnssec/shared/bignum.c

@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "libdnssec/shared/bignum.h"
+#include "libknot/dnssec/shared/bignum.h"
 
 static void skip_leading_zeroes(dnssec_binary_t *value)
 {

src/libknot/dnssec/shared/bignum.h

@@ -7,7 +7,7 @@
 
 #include <stdlib.h>
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 #include "contrib/wire_ctx.h"
 
 /*!

src/libknot/dnssec/shared/binary_wire.h

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 
 #include "contrib/wire_ctx.h"
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 
 static inline wire_ctx_t binary_init(const dnssec_binary_t *binary)
 {

src/libknot/dnssec/shared/dname.c

@@ -9,8 +9,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "libdnssec/shared/dname.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/shared/dname.h"
+#include "libknot/dnssec/shared/shared.h"
 #include "contrib/tolower.h"
 
 /*!

src/libknot/dnssec/shared/keyid_gnutls.c

@@ -10,11 +10,11 @@
 #include <string.h>
 
 #include "contrib/string.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/keyid.h"
-#include "libdnssec/shared/keyid_gnutls.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keyid.h"
+#include "libknot/dnssec/shared/keyid_gnutls.h"
+#include "libknot/dnssec/shared/shared.h"
 
 /*!
  * Get binary key ID from a key (public or private).

src/libknot/dnssec/shared/keyid_gnutls.h

@@ -8,7 +8,7 @@
 #include <gnutls/abstract.h>
 #include <gnutls/gnutls.h>
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 
 int keyid_x509(gnutls_x509_privkey_t key, dnssec_binary_t *id);
 

src/libknot/dnssec/shared/shared.h

@@ -17,7 +17,7 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 #include "libknot/attribute.h"
 
 /*!

src/libknot/dnssec/sign.h

@@ -20,8 +20,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <libdnssec/binary.h>
-#include <libdnssec/key.h>
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/key.h"
 
 struct dnssec_sign_ctx;
 

src/libknot/dnssec/sign/der.c

@@ -5,11 +5,11 @@
 
 #include <stdbool.h>
 
-#include "libdnssec/shared/bignum.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/sign/der.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/shared/bignum.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/sign/der.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 /*
  * In fact, this is a very tiny subset of ASN.1 encoding format implementation,

src/libknot/dnssec/sign/der.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 
 /*
  * The ECDSA signatures in DNSSEC are encoded differently than in X.509

src/libknot/dnssec/sign/sign.c

@@ -11,14 +11,14 @@
 
 #include "contrib/macros.h"
 #include "contrib/vpool/vpool.h"
-#include "libdnssec/shared/bignum.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/key/internal.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/sign.h"
-#include "libdnssec/sign/der.h"
-#include "libdnssec/shared/binary_wire.h"
+#include "libknot/dnssec/shared/bignum.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/key/internal.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/sign.h"
+#include "libknot/dnssec/sign/der.h"
+#include "libknot/dnssec/shared/binary_wire.h"
 
 /*!
  * Signature format conversion callback.

src/libknot/dnssec/tsig.c

@@ -11,10 +11,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libdnssec/shared/dname.h"
-#include "libdnssec/error.h"
-#include "libdnssec/shared/shared.h"
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/shared/dname.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/shared/shared.h"
+#include "libknot/dnssec/tsig.h"
 
 struct dnssec_tsig_ctx {
 	gnutls_mac_algorithm_t algorithm;

src/libknot/dnssec/tsig.h

@@ -17,7 +17,7 @@
 
 #include <stdint.h>
 
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * TSIG algorithms.

src/libknot/error.c

@@ -11,7 +11,7 @@
 
 #include "libknot/attribute.h"
 #include "libknot/error.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 
 struct error {
 	int code;

src/libknot/quic/quic.c

@@ -24,8 +24,8 @@
 #include "contrib/sockaddr.h"
 #include "contrib/ucw/lists.h"
 #include "libknot/endian.h"
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/attribute.h"
 #include "libknot/endian.h"
 #include "libknot/error.h"

src/libknot/quic/quic_conn.c

@@ -15,7 +15,7 @@
 #include "contrib/openbsd/siphash.h"
 #include "contrib/ucw/heap.h"
 #include "contrib/ucw/lists.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/attribute.h"
 #include "libknot/error.h"
 #include "libknot/quic/tls_common.h"

src/libknot/rrset-dump.c

@@ -14,9 +14,9 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/key.h"
-#include "libdnssec/keytag.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keytag.h"
 #include "libknot/attribute.h"
 #include "libknot/rrset-dump.h"
 #include "libknot/codes.h"

src/libknot/rrtype/tsig.c

@@ -10,7 +10,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/tsig.h"
 #include "libknot/attribute.h"
 #include "libknot/rrtype/tsig.h"
 #include "libknot/consts.h"

src/libknot/rrtype/tsig.h

@@ -16,8 +16,8 @@
 
 #include <stdint.h>
 
-#include "libdnssec/binary.h"
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/tsig.h"
 #include "libknot/consts.h"
 #include "libknot/rrset.h"
 #include "libknot/tsig.h"

src/libknot/tsig-op.c

@@ -8,8 +8,8 @@
 #include <time.h>
 #include <stdint.h>
 
-#include "libdnssec/error.h"
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/tsig.h"
 #include "libknot/attribute.h"
 #include "libknot/tsig-op.h"
 #include "libknot/errcode.h"

src/libknot/tsig.c

@@ -8,7 +8,7 @@
 
 #include "contrib/getline.h"
 #include "contrib/string.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "libknot/attribute.h"
 #include "libknot/errcode.h"
 #include "libknot/tsig.h"

src/libknot/tsig.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include "libknot/dname.h"
-#include "libdnssec/tsig.h"
+#include "libknot/dnssec/tsig.h"
 
 /*!
  * \brief TSIG key.

src/libknot/xdp/msg_init.h

@@ -10,7 +10,7 @@
 
 #include "libknot/xdp/msg.h"
 #include "libknot/xdp/tcp.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 
 inline static bool empty_msg(const knot_xdp_msg_t *msg)
 {

src/libknot/xdp/tcp.c

@@ -13,7 +13,7 @@
 #include "libknot/xdp/tcp_iobuf.h"
 #include "libknot/attribute.h"
 #include "libknot/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "contrib/macros.h"
 #include "contrib/openbsd/siphash.h"
 #include "contrib/ucw/lists.h"

src/redis/libs.h

@@ -19,7 +19,7 @@
 #include "contrib/string.c"
 #include "contrib/time.c"
 #include "contrib/ucw/mempool.c"
-#include "libdnssec/key/keytag.c"
+#include "libknot/dnssec/key/keytag.c"
 #include "libknot/codes.c"
 #include "libknot/descriptor.c"
 #include "libknot/dname.c"

src/utils/common/exec.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "utils/common/exec.h"
 #include "utils/common/msg.h"
 #include "utils/common/netio.h"