Update libdnssec -> libknot/dnssec includes

diff --git a/src/knot/conf/schema.c b/src/knot/conf/schema.c
index 9e0ef9a9f6d12dd6235be98d2054651158d49454..d75d8922d157f6d6d8240d8123a0a8d8fc75aafc 100644 (file)
--- a/src/knot/conf/schema.c
+++ b/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))

diff --git a/src/knot/conf/tools.c b/src/knot/conf/tools.c
index 6596c76367fdd20cf4ee2c75594de6393cecf8e4..2e6271731c06002ca4e07a858782e233895b5b45 100644 (file)
--- a/src/knot/conf/tools.c
+++ b/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"

diff --git a/src/knot/dnssec/context.h b/src/knot/dnssec/context.h
index 0e7e8eccdfced8b2314bd8b1d6d461bfb63f0d37..6571aa4f97b3dcda0e8a6f38b83ff2e871ec24ca 100644 (file)
--- a/src/knot/dnssec/context.h
+++ b/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"

diff --git a/src/knot/dnssec/kasp/kasp_zone.c b/src/knot/dnssec/kasp/kasp_zone.c
index 145c8fcb8dcc5074c3b23c98450d5dceee6b01a0..808a7704ec09d704dc625088c796a45495b43306 100644 (file)
--- a/src/knot/dnssec/kasp/kasp_zone.c
+++ b/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
 

diff --git a/src/knot/dnssec/kasp/kasp_zone.h b/src/knot/dnssec/kasp/kasp_zone.h
index 1395df886c119503d4e6c33dd9ace5be22644f7b..64e554c3162b401976cc449ea70a83e27f0f409b 100644 (file)
--- a/src/knot/dnssec/kasp/kasp_zone.h
+++ b/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;

diff --git a/src/knot/dnssec/kasp/keystore.c b/src/knot/dnssec/kasp/keystore.c
index 030f56ebce6329b5e0d0d9140599f7abfa30248e..6ef3ec7c6b2d79026d4669bbd634cba10e486c81 100644 (file)
--- a/src/knot/dnssec/kasp/keystore.c
+++ b/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"

diff --git a/src/knot/dnssec/kasp/keystore.h b/src/knot/dnssec/kasp/keystore.h
index 91de64d6144c6c5c3f4cb3d65a6d476eaa7249bb..e586db5091cd7a12e596077f7d1f3582ff85cc5b 100644 (file)
--- a/src/knot/dnssec/kasp/keystore.h
+++ b/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);

diff --git a/src/knot/dnssec/kasp/policy.h b/src/knot/dnssec/kasp/policy.h
index 56362b395b2a7d96808c30afec1ab55af0104d28..0bf3618bba304501fd1ef0c36dbb32e787ea91ba 100644 (file)
--- a/src/knot/dnssec/kasp/policy.h
+++ b/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"
 
 /*!

diff --git a/src/knot/dnssec/key-events.c b/src/knot/dnssec/key-events.c
index ea67e90ba02da20464e82bd6e55887db6a79c276..5c7f42a3cd3ee6771d1949e301ba127f54b037ee 100644 (file)
--- a/src/knot/dnssec/key-events.c
+++ b/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)
 {

diff --git a/src/knot/dnssec/key_records.c b/src/knot/dnssec/key_records.c
index 150175b54f3c23920c406a297f2426d8673df9d1..547c80e36c514030342e65145d73c06ed7df29ee 100644 (file)
--- a/src/knot/dnssec/key_records.c
+++ b/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"

diff --git a/src/knot/dnssec/nsec-chain.h b/src/knot/dnssec/nsec-chain.h
index 9ce32e85633da551d45ac8503d38ee70a61f13ee..8e52282b28a96c3de0a088e9cfa3c1307037155c 100644 (file)
--- a/src/knot/dnssec/nsec-chain.h
+++ b/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.

diff --git a/src/knot/dnssec/nsec3-chain.h b/src/knot/dnssec/nsec3-chain.h
index 0ed7a2721ec8fff8e752f71c8a4114b1d8373772..122f32c445b3754746c707774cbf1700b3473ac9 100644 (file)
--- a/src/knot/dnssec/nsec3-chain.h
+++ b/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"

diff --git a/src/knot/dnssec/rrset-sign.c b/src/knot/dnssec/rrset-sign.c
index b0e6f6c340fc7ea5078c9ff8622134460d74faa8..1a470ae882984c7da821251aa7a8211f3d5c6d37 100644 (file)
--- a/src/knot/dnssec/rrset-sign.c
+++ b/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

diff --git a/src/knot/dnssec/rrset-sign.h b/src/knot/dnssec/rrset-sign.h
index 83066b49d08b88cc2229741d9e69561b435cbeab..4d346a83af1e31097f133afeb98ce220c73a54aa 100644 (file)
--- a/src/knot/dnssec/rrset-sign.h
+++ b/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"

diff --git a/src/knot/dnssec/zone-events.c b/src/knot/dnssec/zone-events.c
index ad8d8754eb051a15ab8e7d389c3764fb815ef858..d6accaf701c50353eab56261b04ab4b819a23b79 100644 (file)
--- a/src/knot/dnssec/zone-events.c
+++ b/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"

diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 28fd04c04e45c3688a3e75ab77f65671d8b621da..e13e74b8de550a06156269d0e16cfca48e103725 100644 (file)
--- a/src/knot/dnssec/zone-keys.c
+++ b/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"

diff --git a/src/knot/dnssec/zone-keys.h b/src/knot/dnssec/zone-keys.h
index 9d67200431066aa04f26a0d59b05fda2fdef044c..59a8d8dcc1d4b02e6d0b5e43a804ec820298bd59 100644 (file)
--- a/src/knot/dnssec/zone-keys.h
+++ b/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"

diff --git a/src/knot/dnssec/zone-nsec.c b/src/knot/dnssec/zone-nsec.c
index cf53cb50e7d985191c4fe0feebf5dcf24da02008..e2ea91b528b000217f0927caca8b34702d4dd518 100644 (file)
--- a/src/knot/dnssec/zone-nsec.c
+++ b/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"

diff --git a/src/knot/dnssec/zone-sign.c b/src/knot/dnssec/zone-sign.c
index 1ed5c74d3a8296d68baaebad4e48efab486c1782..13f236b1c3dc7a3a7b2dac70c436f9c4999a42be 100644 (file)
--- a/src/knot/dnssec/zone-sign.c
+++ b/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"

diff --git a/src/knot/events/handlers/dnskey_sync.c b/src/knot/events/handlers/dnskey_sync.c
index e10acb5b3bf821100614cd3b191aafd01af4c697..6ee381f38305fe633cd65afb748e64d2953ceb5d 100644 (file)
--- a/src/knot/events/handlers/dnskey_sync.c
+++ b/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, ...) \

diff --git a/src/knot/events/handlers/refresh.c b/src/knot/events/handlers/refresh.c
index e83a219c7c591a90b12b557b08d427a6c6f679ae..04e2c4634b29e9b62c889de9213e185b31a5d225 100644 (file)
--- a/src/knot/events/handlers/refresh.c
+++ b/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"

diff --git a/src/knot/events/handlers/update.c b/src/knot/events/handlers/update.c
index c41debc4470da36dd60bed5b3d63637c437c6917..2229c56686e3156c3ae0619f868606d42849a036 100644 (file)
--- a/src/knot/events/handlers/update.c
+++ b/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"

diff --git a/src/knot/modules/cookies/cookies.c b/src/knot/modules/cookies/cookies.c
index ea6fe8c41212982b83c7bec817d4a97c6c1b6b10..4defb7621f4383aaff6fafd13512edd97bd4d229 100644 (file)
--- a/src/knot/modules/cookies/cookies.c
+++ b/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
 

diff --git a/src/knot/modules/geoip/geoip.c b/src/knot/modules/geoip/geoip.c
index d3911a8168337c7383edd2c3427f99adf1ca8e13..394a7638f7661ad0032f77ab49878832ab6b556c 100644 (file)
--- a/src/knot/modules/geoip/geoip.c
+++ b/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"

diff --git a/src/knot/modules/onlinesign/onlinesign.c b/src/knot/modules/onlinesign/onlinesign.c
index 57bf355ee2e87b3be8bdb3391449fd9bda26bd78..b5d13863cb256a0db503c9683e7f9640fe1125ab 100644 (file)
--- a/src/knot/modules/onlinesign/onlinesign.c
+++ b/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!

diff --git a/src/knot/modules/rrl/functions.c b/src/knot/modules/rrl/functions.c
index a2c5622bab7afe45507748860f373e70903bc1ca..977b86c2ca0c560d2fc20f36b738ebf28d7bca10 100644 (file)
--- a/src/knot/modules/rrl/functions.c
+++ b/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 }

diff --git a/src/knot/modules/rrl/kru.inc.c b/src/knot/modules/rrl/kru.inc.c
index b74f4b74c062b2c8cc403cc928fdce18e6fb6fd4..e93704e4639cd2bd5ffd69c66bfd90eaa09f91c4 100644 (file)
--- a/src/knot/modules/rrl/kru.inc.c
+++ b/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.

diff --git a/src/knot/nameserver/notify.c b/src/knot/nameserver/notify.c
index f16b21a1a44a0cb0ef78f1de2dff9b2d5d87c671..e564546e903fe1cfd7556e98362b668d0e7bce14 100644 (file)
--- a/src/knot/nameserver/notify.c
+++ b/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...) \

diff --git a/src/knot/nameserver/process_query.c b/src/knot/nameserver/process_query.c
index b574ab35981f6415363e9e236b4ee35228e769c1..1f82b1911d2dacf71fef2cdb32aa02ee3d7b85d9 100644 (file)
--- a/src/knot/nameserver/process_query.c
+++ b/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"

diff --git a/src/knot/query/query.c b/src/knot/query/query.c
index a7fd118c6143b1918fb94b6ccc5457010fdc09ad..9e6ecab972333ce298bed668ef3952f07cb91ca6 100644 (file)
--- a/src/knot/query/query.c
+++ b/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)
 {

diff --git a/src/knot/zone/adjust.c b/src/knot/zone/adjust.c
index b055686cfbd7efd3e9518e22113f503be44e423e..221bf7499ca1895dac2a1c243eb24e1a0ccd3d98 100644 (file)
--- a/src/knot/zone/adjust.c
+++ b/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)
 {

diff --git a/src/knot/zone/backup.c b/src/knot/zone/backup.c
index b78b360174c223076f3cda972cff6d645eae396d..8b08f9a498038377a10df2f48d5258425c0e8184 100644 (file)
--- a/src/knot/zone/backup.c
+++ b/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.

diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index dec7740be8ab9f8810d3e4050ab0e9e380dbb623..65ef61a98a2c41e7a0ac17c955a1e9b520b0c760 100644 (file)
--- a/src/knot/zone/contents.c
+++ b/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"

diff --git a/src/knot/zone/contents.h b/src/knot/zone/contents.h
index 96fa3e6d16c7cc11f4e294addcbe9ac01cc6afd2..63590f3c7868d09beb9c26100ba5932f30c885ec 100644 (file)
--- a/src/knot/zone/contents.h
+++ b/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"

diff --git a/src/knot/zone/digest.c b/src/knot/zone/digest.c
index 5bcb46328b777c5093523651e0d3cd28be0ed099..9dc2a133af4e40fbd77a5b918891dfc6177da17b 100644 (file)
--- a/src/knot/zone/digest.c
+++ b/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

diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index f2f2732f8115b17f61b9c5402f319e0a95a4ff17..beda10a17d966369ac1a8d48c63b48ca625a68a5 100644 (file)
--- a/src/knot/zone/semantic-check.c
+++ b/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"

diff --git a/src/libknot/codes.c b/src/libknot/codes.c
index 8ec8b96fb73d2c43738514c267be588446d729e3..458e4eee61ed32332db74c854b4e73cdb4858b66 100644 (file)
--- a/src/libknot/codes.c
+++ b/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[] = {

diff --git a/src/libknot/dnssec/binary.c b/src/libknot/dnssec/binary.c
index 85f12d37f0cab99f06f8dca10021805245908808..27c8008bad7a70b81b757c000208c1c59b12c60a 100644 (file)
--- a/src/libknot/dnssec/binary.c
+++ b/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 ----------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/crypto.c b/src/libknot/dnssec/crypto.c
index c76fc1235a41f6d7aff346d1b55fba201a32d4cc..dd5638cd6e9112c72c65202605224ffb2a2efc29 100644 (file)
--- a/src/libknot/dnssec/crypto.c
+++ b/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)

diff --git a/src/libknot/dnssec/digest.c b/src/libknot/dnssec/digest.c
index b1f28957537d6b8ff2d1230c2c447642043a824d..0271e79b24c82ef337b6af7d373c3f7dac035ece 100644 (file)
--- a/src/libknot/dnssec/digest.c
+++ b/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;

diff --git a/src/libknot/dnssec/digest.h b/src/libknot/dnssec/digest.h
index 6706839159a152ed44ec6208e84a8b420344247b..d7cdeced6f07076fbd5ca5789cc3070f1399731a 100644 (file)
--- a/src/libknot/dnssec/digest.h
+++ b/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,

diff --git a/src/libknot/dnssec/dnssec.h b/src/libknot/dnssec/dnssec.h
index 2a40dee6e8d9f25bedd90535df53c9b49a439a19..793cd0915bcd6679db45fa4b2eb039d1ff92a7dd 100644 (file)
--- a/src/libknot/dnssec/dnssec.h
+++ b/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"

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 8a84278c94c5475255d155d70803da3e847a7fa8..0b418290e0a01ffde091dec0df666292f58f232f 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/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;

diff --git a/src/libknot/dnssec/key.h b/src/libknot/dnssec/key.h
index c7d0b5ca4e6298557bcc545c197de7090cbe53f2..d01343cef1d2558771cdffcd4403a76e548a4e29 100644 (file)
--- a/src/libknot/dnssec/key.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/algorithm.c b/src/libknot/dnssec/key/algorithm.c
index 75f39d0a8098402fe355efdf3d268c1a904a42d8..f0a1379f9f09938375f6d5b3cd415ba837f27c4c 100644 (file)
--- a/src/libknot/dnssec/key/algorithm.c
+++ b/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 ------------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/key/algorithm.h b/src/libknot/dnssec/key/algorithm.h
index 6017727ec21c7984a4469d132b8cce8a316a733b..ad64820f286bef96b0b27345c5651faadd651f1f 100644 (file)
--- a/src/libknot/dnssec/key/algorithm.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/convert.c b/src/libknot/dnssec/key/convert.c
index e21b582e4c794df48569750380d335940e4a63d1..12c185b86c36f56790e5e5a684202024455631dc 100644 (file)
--- a/src/libknot/dnssec/key/convert.c
+++ b/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 -------------------------------------------- */
 

diff --git a/src/libknot/dnssec/key/convert.h b/src/libknot/dnssec/key/convert.h
index 4cf0d0a003305daabc0e30e7d81ba134501d3839..60e7feac396e1a9ed884b14e5cdc0acb5db6a40d 100644 (file)
--- a/src/libknot/dnssec/key/convert.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/dnskey.c b/src/libknot/dnssec/key/dnskey.c
index 5397d6db8e9d47a0e10de352b37e42bb2dff88c8..dd712764772c1e091477ac3af0a1c2d055fe30d7 100644 (file)
--- a/src/libknot/dnssec/key/dnskey.c
+++ b/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 --------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/key/dnskey.h b/src/libknot/dnssec/key/dnskey.h
index 31925dd20c150dce3f8e6d72c1fad00c3f20e6f1..87f601b90ddfb272502a5ea62c2e13b56b7ef75d 100644 (file)
--- a/src/libknot/dnssec/key/dnskey.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/ds.c b/src/libknot/dnssec/key/ds.c
index 729588049def1481a51d40b915f8f80ba4803986..1098cf71b14cfbe5b90376bcb99007d710c93fff 100644 (file)
--- a/src/libknot/dnssec/key/ds.c
+++ b/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>

diff --git a/src/libknot/dnssec/key/internal.h b/src/libknot/dnssec/key/internal.h
index 1ddc80d0151e2ffffd878050fddb8cec7348cc0e..8f69dce7be366c63f2410c2c0a4bfb91a22c232f 100644 (file)
--- a/src/libknot/dnssec/key/internal.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/key.c b/src/libknot/dnssec/key/key.c
index 99cf43dac3b5471bbf27c2f9b3b936d1cb5f244e..684b5d16cbac11be795071f2aebca0a880959325 100644 (file)
--- a/src/libknot/dnssec/key/key.c
+++ b/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"
 
 /*!

diff --git a/src/libknot/dnssec/key/keytag.c b/src/libknot/dnssec/key/keytag.c
index 48ecb8ec5fba74575e3aa15bbc4b95d8d61f19d3..aea768264431e078208471e6ee963fcd0880b6c8 100644 (file)
--- a/src/libknot/dnssec/key/keytag.c
+++ b/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.

diff --git a/src/libknot/dnssec/key/privkey.c b/src/libknot/dnssec/key/privkey.c
index e8401ce940f2d134b62fcfe68ace6a627c8e8c67..a8af82321455fb93fd3c1952021a9a2c192050c8 100644 (file)
--- a/src/libknot/dnssec/key/privkey.c
+++ b/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 --------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/key/privkey.h b/src/libknot/dnssec/key/privkey.h
index 83733ca67a3e37cdf924d21af5b2d0de8f010264..64d8b6ba7d17b8fa9e17bc80115fd1954dccd8f4 100644 (file)
--- a/src/libknot/dnssec/key/privkey.h
+++ b/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.

diff --git a/src/libknot/dnssec/key/simple.c b/src/libknot/dnssec/key/simple.c
index 0fb48fdd88dd84706e453b993314aedf25c8490f..4307280b710cbbd41c12d75cc09fc136cdd5e9cf 100644 (file)
--- a/src/libknot/dnssec/key/simple.c
+++ b/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 ----------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/keyid.c b/src/libknot/dnssec/keyid.c
index cb4d2679fd9fef73acce2ed3b7e58286fd33e5f0..4433f50889e84e71de4b3f4155af57b3d0c781c8 100644 (file)
--- a/src/libknot/dnssec/keyid.c
+++ b/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"

diff --git a/src/libknot/dnssec/keystore.h b/src/libknot/dnssec/keystore.h
index dcebd68bcee3005eccca033aa2dd9336bf037a31..aaca91c5dc5a8c76544cfaff83bb5e7757205c06 100644 (file)
--- a/src/libknot/dnssec/keystore.h
+++ b/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;
 

diff --git a/src/libknot/dnssec/keystore/internal.h b/src/libknot/dnssec/keystore/internal.h
index 7f5bc6b479140be4c3980e4910dcccb0d8cbf19e..e8ba1a381a85876f5d4c2d659e221982195bf983 100644 (file)
--- a/src/libknot/dnssec/keystore/internal.h
+++ b/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

diff --git a/src/libknot/dnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c
index e93430d86163e0b735c44267290ee30b5060e8b7..24b6307639c1d33b2c4e35334eafaf3d80d5c6f0 100644 (file)
--- a/src/libknot/dnssec/keystore/keystore.c
+++ b/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 --------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index dc6a9e82752862c52c0c0e3a05f2324b78b63ebb..4c6bcc7f044b14756371e922637e887000ff5ab0 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/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
 

diff --git a/src/libknot/dnssec/keystore/pkcs8.c b/src/libknot/dnssec/keystore/pkcs8.c
index 7536a0162e4244b58dbf72184b6c7a5e50330ef6..d7e885f0a13032516328e2cd352f704277d187fe 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs8.c
+++ b/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
 

diff --git a/src/libknot/dnssec/keytag.h b/src/libknot/dnssec/keytag.h
index 0fc546663b116fd4aeb982d58fe329c6fcb5c184..5cd565f17a90bc52441788c5874dcd192c5c8575 100644 (file)
--- a/src/libknot/dnssec/keytag.h
+++ b/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.

diff --git a/src/libknot/dnssec/nsec.h b/src/libknot/dnssec/nsec.h
index d7dadaa9d3801acea52d15e6f9cdd5ae352a3579..f50b42992faaccb02bf6f386d403a677391aa8bd 100644 (file)
--- a/src/libknot/dnssec/nsec.h
+++ b/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.

diff --git a/src/libknot/dnssec/nsec/bitmap.c b/src/libknot/dnssec/nsec/bitmap.c
index 43c000fc8f8ce24c77d1745249e216bc9226fbf0..0ab3de75a89a6842e697a09976d81e9672afe807 100644 (file)
--- a/src/libknot/dnssec/nsec/bitmap.c
+++ b/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)

diff --git a/src/libknot/dnssec/nsec/hash.c b/src/libknot/dnssec/nsec/hash.c
index 9c93740086578f29b18dd32f20c7704b02f3b7bf..a21e8d083744c60d5cfdeb575fac59b69abd9da7 100644 (file)
--- a/src/libknot/dnssec/nsec/hash.c
+++ b/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.

diff --git a/src/libknot/dnssec/nsec/nsec.c b/src/libknot/dnssec/nsec/nsec.c
index fbe85ec74cf716e3b206aba0b582f9376aaa4c3c..21a9a3757891ae0b4f0a6b1f5a0ebbe227e39f88 100644 (file)
--- a/src/libknot/dnssec/nsec/nsec.c
+++ b/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.

diff --git a/src/libknot/dnssec/p11/p11.c b/src/libknot/dnssec/p11/p11.c
index efc33b761b359bea23797a234e49756e190b62cf..75a20ec1f3f6a304c7248f51808a4b5c1f8b7e15 100644 (file)
--- a/src/libknot/dnssec/p11/p11.c
+++ b/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
 

diff --git a/src/libknot/dnssec/pem.c b/src/libknot/dnssec/pem.c
index b0e04e2796470f37801c8b13cbb3c9fb63ff3f03..f273b7306af44322caa719afaa38efed67e69f7d 100644 (file)
--- a/src/libknot/dnssec/pem.c
+++ b/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)

diff --git a/src/libknot/dnssec/pem.h b/src/libknot/dnssec/pem.h
index 25cb9751bcb92f0f74ac40b95f7323ca269d62b8..3cb0cc32821976cb1a5a8bfd62c36d9e70373afb 100644 (file)
--- a/src/libknot/dnssec/pem.h
+++ b/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.

diff --git a/src/libknot/dnssec/random.c b/src/libknot/dnssec/random.c
index afcb57c74f1e678f09ea9e10684954424de1d295..82f752d677c3261c52531ad3a2746230784620f2 100644 (file)
--- a/src/libknot/dnssec/random.c
+++ b/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 ----------------------------------------------------------- */
 

diff --git a/src/libknot/dnssec/random.h b/src/libknot/dnssec/random.h
index 997fac7dffa8e4b68d4caa1c8df9e6be20f94648..632ce878023621de76b285f84e89eb6b34babc82 100644 (file)
--- a/src/libknot/dnssec/random.h
+++ b/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.

diff --git a/src/libknot/dnssec/sample_keys.h b/src/libknot/dnssec/sample_keys.h
index 56d771d9e60f47dc9e5d5b0ddf284028edb7b092..7a8fde565994f8902e9922fbb3dc61c651dce262 100644 (file)
--- a/src/libknot/dnssec/sample_keys.h
+++ b/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

diff --git a/src/libknot/dnssec/shared/bignum.c b/src/libknot/dnssec/shared/bignum.c
index 2770220b7f4f11fffb7139a00eb826d27f486810..67503e8a46e91d6f7111a65ac7440223b5840606 100644 (file)
--- a/src/libknot/dnssec/shared/bignum.c
+++ b/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)
 {

diff --git a/src/libknot/dnssec/shared/bignum.h b/src/libknot/dnssec/shared/bignum.h
index 641e6afa33df0cae862e6482a659ec69fa6d289a..d2f1ba4cd3ca091bb9a873cc27d58aa7fa8e66b8 100644 (file)
--- a/src/libknot/dnssec/shared/bignum.h
+++ b/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"
 
 /*!

diff --git a/src/libknot/dnssec/shared/binary_wire.h b/src/libknot/dnssec/shared/binary_wire.h
index f74cc584f05605e3ed8aacfc752850ddaaa544e7..fbc13f026d197a71514d0d9c81e4e1aa41884821 100644 (file)
--- a/src/libknot/dnssec/shared/binary_wire.h
+++ b/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)
 {

diff --git a/src/libknot/dnssec/shared/dname.c b/src/libknot/dnssec/shared/dname.c
index 87436bab13e2aaa73d4ccde7e18c8af3f0a304f7..c50a4beeec74125e4d1dc4064f49f46e2bddb669 100644 (file)
--- a/src/libknot/dnssec/shared/dname.c
+++ b/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"
 
 /*!

diff --git a/src/libknot/dnssec/shared/keyid_gnutls.c b/src/libknot/dnssec/shared/keyid_gnutls.c
index 06793bd5bbd904fa417d164d8507110b5a9140d6..563989bc67d122ea15ef474fb812d108a67257ca 100644 (file)
--- a/src/libknot/dnssec/shared/keyid_gnutls.c
+++ b/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).

diff --git a/src/libknot/dnssec/shared/keyid_gnutls.h b/src/libknot/dnssec/shared/keyid_gnutls.h
index c75a3b10ef4b471b561988792e7a30ee2024e6fb..ba0c1da29d4b25fbafe1395844af42a4c58b4bc8 100644 (file)
--- a/src/libknot/dnssec/shared/keyid_gnutls.h
+++ b/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);
 

diff --git a/src/libknot/dnssec/shared/shared.h b/src/libknot/dnssec/shared/shared.h
index 726dd9d0112895a269b0059b0d103d747c94f9ba..fbf56d5e637a99771d7072baa917cd9608f9f9c9 100644 (file)
--- a/src/libknot/dnssec/shared/shared.h
+++ b/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"
 
 /*!

diff --git a/src/libknot/dnssec/sign.h b/src/libknot/dnssec/sign.h
index 26ffceee1ca1470ced730d5ac92ee4abbfae3cba..f7d7279aeaf43b5b57fd544df9b107f8c911fc5c 100644 (file)
--- a/src/libknot/dnssec/sign.h
+++ b/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;
 

diff --git a/src/libknot/dnssec/sign/der.c b/src/libknot/dnssec/sign/der.c
index 9fdf58c8604ab4cf9abcbbddb83c689d607e7644..4c00742edec723750e17546a756072964ed37fd7 100644 (file)
--- a/src/libknot/dnssec/sign/der.c
+++ b/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,

diff --git a/src/libknot/dnssec/sign/der.h b/src/libknot/dnssec/sign/der.h
index b5e7aa46d35e94827b24e3a7c1f3976ba1652ecb..6adb566f31d44468ebf7421664add3d8d8e2fd54 100644 (file)
--- a/src/libknot/dnssec/sign/der.h
+++ b/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

diff --git a/src/libknot/dnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
index 8ee70ce18b2d48dd8032d0e57e2c7085f1e1e9c8..0c33233cda4cae7a4418d4ca013fbd5c61216106 100644 (file)
--- a/src/libknot/dnssec/sign/sign.c
+++ b/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.

diff --git a/src/libknot/dnssec/tsig.c b/src/libknot/dnssec/tsig.c
index c1b6330911b444f302bf08dfb27197274838b4b8..4cda99bb10020484e8893c280185af36558a4b5e 100644 (file)
--- a/src/libknot/dnssec/tsig.c
+++ b/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;

diff --git a/src/libknot/dnssec/tsig.h b/src/libknot/dnssec/tsig.h
index 5170545ba4b127dc71626c95acc644a74e941fab..debf62268f5c7af4663b1decf3b5d5cd7e3a597e 100644 (file)
--- a/src/libknot/dnssec/tsig.h
+++ b/src/libknot/dnssec/tsig.h
@@ -17,7 +17,7 @@
 
 #include <stdint.h>
 
-#include <libdnssec/binary.h>
+#include "libknot/dnssec/binary.h"
 
 /*!
  * TSIG algorithms.

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 37f3a1c8fe7ee729fe6b540d54c0f6e18a50d819..9b29578563c479dd954c9b18035b14e0e839e2c1 100644 (file)
--- a/src/libknot/error.c
+++ b/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;

diff --git a/src/libknot/quic/quic.c b/src/libknot/quic/quic.c
index 6cefb1084d855316875de2732ee9dfbf9c96ed0e..3a6a6635d4e98df42f79094a4e6fb32bd3dcf04b 100644 (file)
--- a/src/libknot/quic/quic.c
+++ b/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"

diff --git a/src/libknot/quic/quic_conn.c b/src/libknot/quic/quic_conn.c
index 1249442388d2572183b6c211d1b30381591a58a9..94948f2c4449cccf8e1d89229dd0c5e621e43a85 100644 (file)
--- a/src/libknot/quic/quic_conn.c
+++ b/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"

diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c
index 58a3d98f60f856734bbea6557bf1fa237ff67ddc..ea06cf8b3faac7a9ceb86e82a487fef2b062aeaf 100644 (file)
--- a/src/libknot/rrset-dump.c
+++ b/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"

diff --git a/src/libknot/rrtype/tsig.c b/src/libknot/rrtype/tsig.c
index fe36ec61c427a13bc811c0865ce186c5c7743bc8..ee59b7c35316e7b696b509df197f44f620ad1e2f 100644 (file)
--- a/src/libknot/rrtype/tsig.c
+++ b/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"

diff --git a/src/libknot/rrtype/tsig.h b/src/libknot/rrtype/tsig.h
index 08a165c2c3e6e931eaca9d127680056b92858c5b..5b55c6f793297381863b8d8fa768eeaca3a2fe8b 100644 (file)
--- a/src/libknot/rrtype/tsig.h
+++ b/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"

diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index 455363aa98a0a5d3a6de734b18b8982495058d11..cdd0c5c55fbe0e0650b39da89303ae4738f63318 100644 (file)
--- a/src/libknot/tsig-op.c
+++ b/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"

diff --git a/src/libknot/tsig.c b/src/libknot/tsig.c
index 660db1760fdb5f0bc8c343eebfcfa8ab7feda918..f8d3ddfe44b1bdf1f5723d97d4909d9f3dcaa44f 100644 (file)
--- a/src/libknot/tsig.c
+++ b/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"

diff --git a/src/libknot/tsig.h b/src/libknot/tsig.h
index 082f6b0da7c5b2aedc42269d2feba7a29c6a46c6..20fed90b345ecb45634a83349e1e3b0cd72ea4e4 100644 (file)
--- a/src/libknot/tsig.h
+++ b/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.

diff --git a/src/libknot/xdp/msg_init.h b/src/libknot/xdp/msg_init.h
index d4db446b38a2ee5b207ff1b27375196f3a2a8345..eff1b7fcbc0bdbabe35020e9fc996830e9dc08f4 100644 (file)
--- a/src/libknot/xdp/msg_init.h
+++ b/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)
 {

diff --git a/src/libknot/xdp/tcp.c b/src/libknot/xdp/tcp.c
index 117dbee690114886b61798a0078159e3ffaac52c..889703a8d8ee33aeeb622c964f37497b1f74ff2d 100644 (file)
--- a/src/libknot/xdp/tcp.c
+++ b/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"

diff --git a/src/redis/libs.h b/src/redis/libs.h
index 7ce3a655f3c8551c547576fb30abd8ffaf6f30d1..a42e9a56db8763fd53186775f116f4b401162fd4 100644 (file)
--- a/src/redis/libs.h
+++ b/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"

diff --git a/src/utils/common/exec.c b/src/utils/common/exec.c
index 609f95c997a052a8eda2565ea8e12b75cd969b16..23483cf92cfbf125ddf7d8c33cb75cd857e69226 100644 (file)
--- a/src/utils/common/exec.c
+++ b/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"

diff --git a/src/utils/common/quic.c b/src/utils/common/quic.c
index d4dd2c2baf90b07e2f570cac0491b939acd891e0..487f0b0c5ef3bc11afd82f9bb47d5b6b2cba344b 100644 (file)
--- a/src/utils/common/quic.c
+++ b/src/utils/common/quic.c
@@ -40,8 +40,8 @@ void quic_params_clean(quic_params_t *params)
 #include <ngtcp2/ngtcp2_crypto_gnutls.h>
 
 #include "contrib/macros.h"
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/xdp/tcp_iobuf.h"
 #include "utils/common/params.h"
 

diff --git a/src/utils/kdig/kdig_main.c b/src/utils/kdig/kdig_main.c
index d42de7ca9ecbfa5c61f18551ba185145a4b6516f..62a99db0d661e5f2bc17d3bdb51b8695a58bb9c0 100644 (file)
--- a/src/utils/kdig/kdig_main.c
+++ b/src/utils/kdig/kdig_main.c
@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 
-#include "libdnssec/crypto.h"
+#include "libknot/dnssec/crypto.h"
 #include "utils/kdig/kdig_params.h"
 #include "utils/kdig/kdig_exec.h"
 #include "libknot/libknot.h"

diff --git a/src/utils/kdig/kdig_params.c b/src/utils/kdig/kdig_params.c
index 34cfc559e49d591a5d79779e1bfcf6a8e005d609..5b7b83e53a54cc3c7f78c85ab4357287d122079b 100644 (file)
--- a/src/utils/kdig/kdig_params.c
+++ b/src/utils/kdig/kdig_params.c
@@ -23,8 +23,8 @@
 #include "contrib/strtonum.h"
 #include "contrib/time.h"
 #include "contrib/ucw/lists.h"
-#include "libdnssec/error.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 
 #define PROGRAM_NAME "kdig"
 

diff --git a/src/utils/keymgr/bind_privkey.c b/src/utils/keymgr/bind_privkey.c
index fe854f052cfb51e597dd621526edf4c77e01ccd6..104cf7b81bf4b72502d41fd980c7cf1699ca53bc 100644 (file)
--- a/src/utils/keymgr/bind_privkey.c
+++ b/src/utils/keymgr/bind_privkey.c
@@ -7,10 +7,10 @@
 
 #include "contrib/ctype.h"
 #include "contrib/strtonum.h"
-#include "libdnssec/binary.h"
-#include "libdnssec/error.h"
-#include "libdnssec/pem.h"
-#include "libdnssec/shared/shared.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/pem.h"
+#include "libknot/dnssec/shared/shared.h"
 #include "utils/keymgr/bind_privkey.h"
 
 /* -- private key params conversion ---------------------------------------- */

diff --git a/src/utils/keymgr/bind_privkey.h b/src/utils/keymgr/bind_privkey.h
index b7d8e5e0b95d2fd5b78177be91a1bb6be1751090..014b38c2b581eb56efad38d12f9666e5c912d2d2 100644 (file)
--- a/src/utils/keymgr/bind_privkey.h
+++ b/src/utils/keymgr/bind_privkey.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#include "libdnssec/binary.h"
+#include "libknot/dnssec/binary.h"
 #include "knot/dnssec/kasp/policy.h"
 
 /*!

diff --git a/src/utils/keymgr/functions.c b/src/utils/keymgr/functions.c
index f60e497a186866bb92850fc2d2e95b1818e569c0..cc3600050a0e7fb9d983d4e06540f28ecebb1345 100644 (file)
--- a/src/utils/keymgr/functions.c
+++ b/src/utils/keymgr/functions.c
@@ -21,9 +21,9 @@
 #include "contrib/strtonum.h"
 #include "contrib/tolower.h"
 #include "contrib/wire_ctx.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 "knot/dnssec/kasp/policy.h"
 #include "knot/dnssec/key-events.h"
 #include "knot/dnssec/rrset-sign.h"

diff --git a/src/utils/keymgr/keystore.c b/src/utils/keymgr/keystore.c
index 06f841dffb921ee5cec53e1b7175d12703e7d47f..d283ec4c955202ac8ab12be4a4a68cca4d08579b 100644 (file)
--- a/src/utils/keymgr/keystore.c
+++ b/src/utils/keymgr/keystore.c
@@ -10,12 +10,12 @@
 #include "contrib/color.h"
 #include "contrib/spinlock.h"
 #include "contrib/time.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key/algorithm.h"
-#include "libdnssec/key/privkey.h"
-#include "libdnssec/random.h"
-#include "libdnssec/sample_keys.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key/algorithm.h"
+#include "libknot/dnssec/key/privkey.h"
+#include "libknot/dnssec/random.h"
+#include "libknot/dnssec/sample_keys.h"
+#include "libknot/dnssec/sign.h"
 #include "libknot/errcode.h"
 #include "knot/conf/conf.h"
 #include "knot/dnssec/kasp/kasp_zone.h"

diff --git a/src/utils/keymgr/main.c b/src/utils/keymgr/main.c
index 9bdf0b4f24815054cd9565e1c586478eb1752189..dad690d926107cd91eddda46ab14ea8fe3144bd0 100644 (file)
--- a/src/utils/keymgr/main.c
+++ b/src/utils/keymgr/main.c
@@ -10,7 +10,7 @@
 
 #include "contrib/strtonum.h"
 #include "knot/dnssec/zone-keys.h"
-#include "libdnssec/crypto.h"
+#include "libknot/dnssec/crypto.h"
 #include "libknot/libknot.h"
 #include "utils/common/msg.h"
 #include "utils/common/params.h"

diff --git a/src/utils/khost/khost_main.c b/src/utils/khost/khost_main.c
index 0a220c6222c5468a97a27f49cba3a4d6ace2fdaa..253e3958326b6c3385ae654aa81a85fa64db679b 100644 (file)
--- a/src/utils/khost/khost_main.c
+++ b/src/utils/khost/khost_main.c
@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 
-#include "libdnssec/crypto.h"
+#include "libknot/dnssec/crypto.h"
 #include "utils/khost/khost_params.h"
 #include "utils/kdig/kdig_exec.h"
 #include "libknot/libknot.h"

diff --git a/src/utils/knotd/main.c b/src/utils/knotd/main.c
index 4c10e4add828c305fd5989f86ed8ccc0781b0f0c..016089b48d14d7892abd3557c29c4d89da39f237 100644 (file)
--- a/src/utils/knotd/main.c
+++ b/src/utils/knotd/main.c
@@ -19,7 +19,7 @@
 #include <cap-ng.h>
 #endif
 
-#include "libdnssec/crypto.h"
+#include "libknot/dnssec/crypto.h"
 #include "libknot/libknot.h"
 #include "contrib/strtonum.h"
 #include "contrib/threads.h"

diff --git a/src/utils/knsec3hash/knsec3hash.c b/src/utils/knsec3hash/knsec3hash.c
index d196cf912c0481c5d8020b4d096b1534639e0aca..9fa0abc5a7fc67963bfb0dc7b79be78e30802a73 100644 (file)
--- a/src/utils/knsec3hash/knsec3hash.c
+++ b/src/utils/knsec3hash/knsec3hash.c
@@ -12,8 +12,8 @@
 #include "contrib/base32hex.h"
 #include "contrib/string.h"
 #include "contrib/strtonum.h"
-#include "libdnssec/error.h"
-#include "libdnssec/nsec.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/nsec.h"
 #include "libknot/libknot.h"
 #include "utils/common/msg.h"
 #include "utils/common/params.h"

diff --git a/src/utils/knsupdate/knsupdate_exec.c b/src/utils/knsupdate/knsupdate_exec.c
index 8ca0e69c60cf26518144a41a6a0846db86a35890..24b40f19d4951344aacb39ec59bfc62fc81787a6 100644 (file)
--- a/src/utils/knsupdate/knsupdate_exec.c
+++ b/src/utils/knsupdate/knsupdate_exec.c
@@ -10,7 +10,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "libdnssec/random.h"
+#include "libknot/dnssec/random.h"
 #include "utils/knsupdate/knsupdate_exec.h"
 #include "utils/knsupdate/knsupdate_interactive.h"
 #include "utils/common/exec.h"

diff --git a/src/utils/knsupdate/knsupdate_main.c b/src/utils/knsupdate/knsupdate_main.c
index ec49a94425ab933dc446f2904df7298e8ec96511..0d8551686b9d62e43009a7a39f5a3a96b91d7314 100644 (file)
--- a/src/utils/knsupdate/knsupdate_main.c
+++ b/src/utils/knsupdate/knsupdate_main.c
@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 
-#include "libdnssec/crypto.h"
+#include "libknot/dnssec/crypto.h"
 #include "utils/knsupdate/knsupdate_exec.h"
 #include "utils/knsupdate/knsupdate_params.h"
 #include "libknot/libknot.h"

diff --git a/tests/contrib/test_strtonum.c b/tests/contrib/test_strtonum.c
index 2946830639b773d93144aeb2c43bf99d6fd16897..3760317b39afa21a337e2bc9b9dbca2963be0567 100644 (file)
--- a/tests/contrib/test_strtonum.c
+++ b/tests/contrib/test_strtonum.c
@@ -9,7 +9,7 @@
 #include <tap/basic.h>
 
 #include "contrib/strtonum.h"
-#include "libdnssec/error.h"
+#include "libknot/dnssec/error.h"
 #include "libknot/attribute.h"
 
 static void test_u8(const char *in, uint8_t expected, int errcode)

diff --git a/tests/libdnssec/test_key.c b/tests/libdnssec/test_key.c
index a4d36999b8ae35c2d82d0d5fe418ee25e7a17d37..1bb840391dfe5322b4676c4c6129d07a2305d998 100644 (file)
--- a/tests/libdnssec/test_key.c
+++ b/tests/libdnssec/test_key.c
@@ -11,7 +11,7 @@
 #include "error.h"
 #include "key.h"
 
-#include "libdnssec/sample_keys.h"
+#include "libknot/dnssec/sample_keys.h"
 
 #define check_attr_scalar(key, type, name, def_val, set_val) { \
        type value = dnssec_key_get_##name(key); \

diff --git a/tests/libdnssec/test_key_ds.c b/tests/libdnssec/test_key_ds.c
index a19419a6d099f7f4b1e5e31b456aa7245b8b7977..15df6f094b14b833bd10e100822e5716f0da22f4 100644 (file)
--- a/tests/libdnssec/test_key_ds.c
+++ b/tests/libdnssec/test_key_ds.c
@@ -8,10 +8,10 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "libdnssec/crypto.h"
-#include "libdnssec/error.h"
-#include "libdnssec/key.h"
-#include "libdnssec/sample_keys.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/sample_keys.h"
 
 static void test_key(const char *name, const struct key_parameters *params)
 {

diff --git a/tests/libdnssec/test_keystore_pkcs11.c b/tests/libdnssec/test_keystore_pkcs11.c
index cd3e756c44eaffe2e563ba397c9999dc8094640c..4a862a87df6b849a1cc3c531f816d64c6c273a36 100644 (file)
--- a/tests/libdnssec/test_keystore_pkcs11.c
+++ b/tests/libdnssec/test_keystore_pkcs11.c
@@ -14,11 +14,11 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "libdnssec/crypto.h"
-#include "libdnssec/error.h"
-#include "libdnssec/keystore.h"
-#include "libdnssec/sample_keys.h"
-#include "libdnssec/sign.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keystore.h"
+#include "libknot/dnssec/sample_keys.h"
+#include "libknot/dnssec/sign.h"
 
 #define ENV_SOFTHSM_DSO  "KNOT_SOFTHSM2_DSO"
 #define ENV_SOFTHSM_UTIL "KNOT_SOFTHSM2_UTIL"

diff --git a/tests/libdnssec/test_sign.c b/tests/libdnssec/test_sign.c
index 70522466985066dea9f48cdce48de68e15f707a8..622ebd95c1e03c3949d2730013e813421d6921be 100644 (file)
--- a/tests/libdnssec/test_sign.c
+++ b/tests/libdnssec/test_sign.c
@@ -12,7 +12,7 @@
 #include "key.h"
 #include "sign.h"
 
-#include "libdnssec/sample_keys.h"
+#include "libknot/dnssec/sample_keys.h"
 
 static const dnssec_binary_t input_data = {
        .size = 25,

diff --git a/tests/modules/test_rrl.c b/tests/modules/test_rrl.c
index cc74350ef19de89a4a4abe0151c00fe691490ad7..18be3becff600358b9121a242c4ffba87c105d45 100644 (file)
--- a/tests/modules/test_rrl.c
+++ b/tests/modules/test_rrl.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <stdatomic.h>
 
-#include "libdnssec/crypto.h"
-#include "libdnssec/random.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/random.h"
 #include "libknot/libknot.h"
 #include "contrib/openbsd/siphash.h"
 #include "contrib/sockaddr.h"