libknot: move to libknot/dnssec/

diff --git a/Knot.files b/Knot.files
index 71d23fdc5bf87706a08b7c36deeddcf55c6c51d0..f8db87443292d4c97d4aaf0e81cba92c51174d05 100644 (file)
--- a/Knot.files
+++ b/Knot.files
@@ -419,62 +419,6 @@ src/knot/zone/zonedb.c
 src/knot/zone/zonedb.h
 src/knot/zone/zonefile.c
 src/knot/zone/zonefile.h
-src/libdnssec/binary.c
-src/libdnssec/binary.h
-src/libdnssec/crypto.c
-src/libdnssec/crypto.h
-src/libdnssec/digest.c
-src/libdnssec/digest.h
-src/libdnssec/dnssec.h
-src/libdnssec/error.c
-src/libdnssec/error.h
-src/libdnssec/key.h
-src/libdnssec/key/algorithm.c
-src/libdnssec/key/algorithm.h
-src/libdnssec/key/convert.c
-src/libdnssec/key/convert.h
-src/libdnssec/key/dnskey.c
-src/libdnssec/key/dnskey.h
-src/libdnssec/key/ds.c
-src/libdnssec/key/internal.h
-src/libdnssec/key/key.c
-src/libdnssec/key/keytag.c
-src/libdnssec/key/privkey.c
-src/libdnssec/key/privkey.h
-src/libdnssec/key/simple.c
-src/libdnssec/keyid.c
-src/libdnssec/keyid.h
-src/libdnssec/keystore.h
-src/libdnssec/keystore/internal.h
-src/libdnssec/keystore/keystore.c
-src/libdnssec/keystore/pkcs11.c
-src/libdnssec/keystore/pkcs8.c
-src/libdnssec/keytag.h
-src/libdnssec/nsec.h
-src/libdnssec/nsec/bitmap.c
-src/libdnssec/nsec/hash.c
-src/libdnssec/nsec/nsec.c
-src/libdnssec/p11/p11.c
-src/libdnssec/p11/p11.h
-src/libdnssec/pem.c
-src/libdnssec/pem.h
-src/libdnssec/random.c
-src/libdnssec/random.h
-src/libdnssec/sample_keys.h
-src/libdnssec/shared/bignum.c
-src/libdnssec/shared/bignum.h
-src/libdnssec/shared/binary_wire.h
-src/libdnssec/shared/dname.c
-src/libdnssec/shared/dname.h
-src/libdnssec/shared/keyid_gnutls.c
-src/libdnssec/shared/keyid_gnutls.h
-src/libdnssec/shared/shared.h
-src/libdnssec/sign.h
-src/libdnssec/sign/der.c
-src/libdnssec/sign/der.h
-src/libdnssec/sign/sign.c
-src/libdnssec/tsig.c
-src/libdnssec/tsig.h
 src/libknot/attribute.h
 src/libknot/codes.c
 src/libknot/codes.h
@@ -492,6 +436,62 @@ src/libknot/descriptor.c
 src/libknot/descriptor.h
 src/libknot/dname.c
 src/libknot/dname.h
+src/libknot/dnssec/binary.c
+src/libknot/dnssec/binary.h
+src/libknot/dnssec/crypto.c
+src/libknot/dnssec/crypto.h
+src/libknot/dnssec/digest.c
+src/libknot/dnssec/digest.h
+src/libknot/dnssec/dnssec.h
+src/libknot/dnssec/error.c
+src/libknot/dnssec/error.h
+src/libknot/dnssec/key.h
+src/libknot/dnssec/key/algorithm.c
+src/libknot/dnssec/key/algorithm.h
+src/libknot/dnssec/key/convert.c
+src/libknot/dnssec/key/convert.h
+src/libknot/dnssec/key/dnskey.c
+src/libknot/dnssec/key/dnskey.h
+src/libknot/dnssec/key/ds.c
+src/libknot/dnssec/key/internal.h
+src/libknot/dnssec/key/key.c
+src/libknot/dnssec/key/keytag.c
+src/libknot/dnssec/key/privkey.c
+src/libknot/dnssec/key/privkey.h
+src/libknot/dnssec/key/simple.c
+src/libknot/dnssec/keyid.c
+src/libknot/dnssec/keyid.h
+src/libknot/dnssec/keystore.h
+src/libknot/dnssec/keystore/internal.h
+src/libknot/dnssec/keystore/keystore.c
+src/libknot/dnssec/keystore/pkcs11.c
+src/libknot/dnssec/keystore/pkcs8.c
+src/libknot/dnssec/keytag.h
+src/libknot/dnssec/nsec.h
+src/libknot/dnssec/nsec/bitmap.c
+src/libknot/dnssec/nsec/hash.c
+src/libknot/dnssec/nsec/nsec.c
+src/libknot/dnssec/p11/p11.c
+src/libknot/dnssec/p11/p11.h
+src/libknot/dnssec/pem.c
+src/libknot/dnssec/pem.h
+src/libknot/dnssec/random.c
+src/libknot/dnssec/random.h
+src/libknot/dnssec/sample_keys.h
+src/libknot/dnssec/shared/bignum.c
+src/libknot/dnssec/shared/bignum.h
+src/libknot/dnssec/shared/binary_wire.h
+src/libknot/dnssec/shared/dname.c
+src/libknot/dnssec/shared/dname.h
+src/libknot/dnssec/shared/keyid_gnutls.c
+src/libknot/dnssec/shared/keyid_gnutls.h
+src/libknot/dnssec/shared/shared.h
+src/libknot/dnssec/sign.h
+src/libknot/dnssec/sign/der.c
+src/libknot/dnssec/sign/der.h
+src/libknot/dnssec/sign/sign.c
+src/libknot/dnssec/tsig.c
+src/libknot/dnssec/tsig.h
 src/libknot/dynarray.h
 src/libknot/endian.h
 src/libknot/errcode.h

diff --git a/Knot.includes b/Knot.includes
index 4fbaa6ebd64a294657a6657e21b80e745cf6f34f..c446244618aaeb8f1b2fc7824ab8bdfc80bdf9ed 100644 (file)
--- a/Knot.includes
+++ b/Knot.includes
@@ -42,16 +42,16 @@ src/knot/server
 src/knot/updates
 src/knot/worker
 src/knot/zone
-src/libdnssec
-src/libdnssec/key
-src/libdnssec/keystore
-src/libdnssec/nsec
-src/libdnssec/p11
-src/libdnssec/shared
-src/libdnssec/sign
 src/libknot
 src/libknot/control
 src/libknot/db
+src/libknot/dnssec
+src/libknot/dnssec/key
+src/libknot/dnssec/keystore
+src/libknot/dnssec/nsec
+src/libknot/dnssec/p11
+src/libknot/dnssec/shared
+src/libknot/dnssec/sign
 src/libknot/packet
 src/libknot/probe
 src/libknot/rrtype

diff --git a/src/Makefile.am b/src/Makefile.am
index d6c00a19fb0c7256cec19332a458a64f7b377cd8..dfb6c0f1023bc433b7e62c5810f62f46664c311d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,6 @@ noinst_LTLIBRARIES =
 pkgconfig_DATA =
 
 include $(srcdir)/contrib/Makefile.inc
-include $(srcdir)/libdnssec/Makefile.inc
 include $(srcdir)/libknot/Makefile.inc
 include $(srcdir)/libzscanner/Makefile.inc
 include $(srcdir)/knot/Makefile.inc

diff --git a/src/libdnssec.pc.in b/src/libdnssec.pc.in
deleted file mode 100644 (file)
index 6c0aa5c..0000000
--- a/src/libdnssec.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-soname=@libdnssec_SONAME@
-
-Name: libdnssec
-Description: Knot DNS DNSSEC library
-URL: https://www.knot-dns.cz
-Version: @PACKAGE_VERSION@
-Requires.private: gnutls >= 3.3
-Libs: -L${libdir} -ldnssec
-Cflags: -I${includedir}

diff --git a/src/libdnssec/Makefile.inc b/src/libdnssec/Makefile.inc
deleted file mode 100644 (file)
index 62050b3..0000000
--- a/src/libdnssec/Makefile.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-lib_LTLIBRARIES += libdnssec.la
-pkgconfig_DATA  += libdnssec.pc
-
-libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS)
-libdnssec_la_LDFLAGS  = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
-libdnssec_la_LIBADD   = $(libcontrib_LIBS) $(gnutls_LIBS)
-if ENABLE_PKCS11
-libdnssec_la_LIBADD  += $(pthread_LIBS)
-endif
-
-EXTRA_DIST += \
-       libdnssec/sample_keys.h
-
-include_libdnssecdir = $(includedir)/libdnssec
-include_libdnssec_HEADERS = \
-       libdnssec/binary.h                      \
-       libdnssec/crypto.h                      \
-       libdnssec/digest.h                      \
-       libdnssec/dnssec.h                      \
-       libdnssec/error.h                       \
-       libdnssec/key.h                         \
-       libdnssec/keyid.h                       \
-       libdnssec/keystore.h                    \
-       libdnssec/keytag.h                      \
-       libdnssec/nsec.h                        \
-       libdnssec/pem.h                         \
-       libdnssec/random.h                      \
-       libdnssec/sign.h                        \
-       libdnssec/tsig.h                        \
-       libdnssec/version.h
-
-libdnssec_la_SOURCES = \
-       libdnssec/binary.c                      \
-       libdnssec/crypto.c                      \
-       libdnssec/digest.c                      \
-       libdnssec/error.c                       \
-       libdnssec/key/algorithm.c               \
-       libdnssec/key/algorithm.h               \
-       libdnssec/key/convert.c                 \
-       libdnssec/key/convert.h                 \
-       libdnssec/key/dnskey.c                  \
-       libdnssec/key/dnskey.h                  \
-       libdnssec/key/ds.c                      \
-       libdnssec/key/internal.h                \
-       libdnssec/key/key.c                     \
-       libdnssec/key/keytag.c                  \
-       libdnssec/key/privkey.c                 \
-       libdnssec/key/privkey.h                 \
-       libdnssec/key/simple.c                  \
-       libdnssec/keyid.c                       \
-       libdnssec/keystore/internal.h           \
-       libdnssec/keystore/keystore.c           \
-       libdnssec/keystore/pkcs11.c             \
-       libdnssec/keystore/pkcs8.c              \
-       libdnssec/nsec/bitmap.c                 \
-       libdnssec/nsec/hash.c                   \
-       libdnssec/nsec/nsec.c                   \
-       libdnssec/p11/p11.c                     \
-       libdnssec/p11/p11.h                     \
-       libdnssec/pem.c                         \
-       libdnssec/random.c                      \
-       libdnssec/shared/bignum.c               \
-       libdnssec/shared/bignum.h               \
-       libdnssec/shared/binary_wire.h          \
-       libdnssec/shared/dname.c                \
-       libdnssec/shared/dname.h                \
-       libdnssec/shared/keyid_gnutls.c         \
-       libdnssec/shared/keyid_gnutls.h         \
-       libdnssec/shared/shared.h               \
-       libdnssec/sign/der.c                    \
-       libdnssec/sign/der.h                    \
-       libdnssec/sign/sign.c                   \
-       libdnssec/tsig.c

diff --git a/src/libdnssec/version.h.in b/src/libdnssec/version.h.in
deleted file mode 100644 (file)
index d987821..0000000
--- a/src/libdnssec/version.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-/*  Copyright (C) CZ.NIC, z.s.p.o. and contributors
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  For more information, see <https://www.knot-dns.cz/>
- */
-
-#pragma once
-
-#define DNSSEC_VERSION_MAJOR @KNOT_VERSION_MAJOR@
-#define DNSSEC_VERSION_MINOR @KNOT_VERSION_MINOR@
-#define DNSSEC_VERSION_PATCH 0x0@KNOT_VERSION_PATCH@
-
-#define DNSSEC_VERSION_HEX ((DNSSEC_VERSION_MAJOR << 16) | \
-                            (DNSSEC_VERSION_MINOR <<  8) | \
-                            (DNSSEC_VERSION_PATCH))

diff --git a/src/libknot.pc.in b/src/libknot.pc.in
index 9ce780237b5773cbfe846b82363fa6453c40c34d..0f78d29ed3c9ca2d51d8e9a788c35bf9fff7dbb4 100644 (file)
--- a/src/libknot.pc.in
+++ b/src/libknot.pc.in
@@ -8,7 +8,6 @@ Name: libknot
 Description: Knot DNS library
 URL: https://www.knot-dns.cz
 Version: @PACKAGE_VERSION@
-Requires.private: libdnssec = @PACKAGE_VERSION@
 Libs: -L${libdir} -lknot
 Libs.private: -lm @lmdb_LIBS@
 Cflags: -I${includedir}

diff --git a/src/libknot/Makefile.inc b/src/libknot/Makefile.inc
index d09ff55e5a1cf9460ca2909dac249178cada74ec..86658080870ceb76b86c5ca9170ebdbf450afc8d 100755 (executable)
--- a/src/libknot/Makefile.inc
+++ b/src/libknot/Makefile.inc
@@ -3,15 +3,22 @@ pkgconfig_DATA  += libknot.pc
 
 libknot_la_CPPFLAGS = $(embedded_libngtcp2_CFLAGS) \
                       $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS) \
-                      ${fuzzer_CFLAGS}
+                      $(gnutls_CFLAGS) ${fuzzer_CFLAGS}
 libknot_la_LDFLAGS  = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS) \
                       ${fuzzer_LDFLAGS}
-libknot_la_LIBADD   = libdnssec.la $(libcontrib_LIBS) $(lmdb_LIBS) $(math_LIBS)
+libknot_la_LIBADD   = $(libcontrib_LIBS) $(lmdb_LIBS) $(gnutls_LIBS) $(math_LIBS)
 
 if EMBEDDED_LIBNGTCP2
-libknot_la_LIBADD += $(libembngtcp2_LIBS)
+libknot_la_LIBADD  += $(libembngtcp2_LIBS)
 endif EMBEDDED_LIBNGTCP2
 
+if ENABLE_PKCS11
+libknot_la_LIBADD  += $(pthread_LIBS)
+endif
+
+EXTRA_DIST += \
+       libknot/dnssec/sample_keys.h
+
 include_libknotdir = $(includedir)
 nobase_include_libknot_HEADERS = \
        libknot/attribute.h                     \
@@ -31,6 +38,20 @@ nobase_include_libknot_HEADERS = \
        libknot/db/db.h                         \
        libknot/db/db_lmdb.h                    \
        libknot/db/db_trie.h                    \
+       libknot/dnssec/binary.h                 \
+       libknot/dnssec/crypto.h                 \
+       libknot/dnssec/digest.h                 \
+       libknot/dnssec/dnssec.h                 \
+       libknot/dnssec/error.h                  \
+       libknot/dnssec/key.h                    \
+       libknot/dnssec/keyid.h                  \
+       libknot/dnssec/keystore.h               \
+       libknot/dnssec/keytag.h                 \
+       libknot/dnssec/nsec.h                   \
+       libknot/dnssec/pem.h                    \
+       libknot/dnssec/random.h                 \
+       libknot/dnssec/sign.h                   \
+       libknot/dnssec/tsig.h                   \
        libknot/packet/compr.h                  \
        libknot/packet/pkt.h                    \
        libknot/packet/rrset-wire.h             \
@@ -76,6 +97,47 @@ libknot_la_SOURCES = \
        libknot/error.c                         \
        libknot/db/db_lmdb.c                    \
        libknot/db/db_trie.c                    \
+       libknot/dnssec/binary.c                 \
+       libknot/dnssec/crypto.c                 \
+       libknot/dnssec/digest.c                 \
+       libknot/dnssec/error.c                  \
+       libknot/dnssec/key/algorithm.c          \
+       libknot/dnssec/key/algorithm.h          \
+       libknot/dnssec/key/convert.c            \
+       libknot/dnssec/key/convert.h            \
+       libknot/dnssec/key/dnskey.c             \
+       libknot/dnssec/key/dnskey.h             \
+       libknot/dnssec/key/ds.c                 \
+       libknot/dnssec/key/internal.h           \
+       libknot/dnssec/key/key.c                \
+       libknot/dnssec/key/keytag.c             \
+       libknot/dnssec/key/privkey.c            \
+       libknot/dnssec/key/privkey.h            \
+       libknot/dnssec/key/simple.c             \
+       libknot/dnssec/keyid.c                  \
+       libknot/dnssec/keystore/internal.h      \
+       libknot/dnssec/keystore/keystore.c      \
+       libknot/dnssec/keystore/pkcs11.c        \
+       libknot/dnssec/keystore/pkcs8.c         \
+       libknot/dnssec/nsec/bitmap.c            \
+       libknot/dnssec/nsec/hash.c              \
+       libknot/dnssec/nsec/nsec.c              \
+       libknot/dnssec/p11/p11.c                \
+       libknot/dnssec/p11/p11.h                \
+       libknot/dnssec/pem.c                    \
+       libknot/dnssec/random.c                 \
+       libknot/dnssec/shared/bignum.c          \
+       libknot/dnssec/shared/bignum.h          \
+       libknot/dnssec/shared/binary_wire.h     \
+       libknot/dnssec/shared/dname.c           \
+       libknot/dnssec/shared/dname.h           \
+       libknot/dnssec/shared/keyid_gnutls.c    \
+       libknot/dnssec/shared/keyid_gnutls.h    \
+       libknot/dnssec/shared/shared.h          \
+       libknot/dnssec/sign/der.c               \
+       libknot/dnssec/sign/der.h               \
+       libknot/dnssec/sign/sign.c              \
+       libknot/dnssec/tsig.c                   \
        libknot/packet/pkt.c                    \
        libknot/packet/rrset-wire.c             \
        libknot/probe/data.c                    \

diff --git a/src/libdnssec/binary.c b/src/libknot/dnssec/binary.c
similarity index 100%
rename from src/libdnssec/binary.c
rename to src/libknot/dnssec/binary.c

diff --git a/src/libdnssec/binary.h b/src/libknot/dnssec/binary.h
similarity index 100%
rename from src/libdnssec/binary.h
rename to src/libknot/dnssec/binary.h

diff --git a/src/libdnssec/crypto.c b/src/libknot/dnssec/crypto.c
similarity index 100%
rename from src/libdnssec/crypto.c
rename to src/libknot/dnssec/crypto.c

diff --git a/src/libdnssec/crypto.h b/src/libknot/dnssec/crypto.h
similarity index 100%
rename from src/libdnssec/crypto.h
rename to src/libknot/dnssec/crypto.h

diff --git a/src/libdnssec/digest.c b/src/libknot/dnssec/digest.c
similarity index 100%
rename from src/libdnssec/digest.c
rename to src/libknot/dnssec/digest.c

diff --git a/src/libdnssec/digest.h b/src/libknot/dnssec/digest.h
similarity index 100%
rename from src/libdnssec/digest.h
rename to src/libknot/dnssec/digest.h

diff --git a/src/libdnssec/dnssec.h b/src/libknot/dnssec/dnssec.h
similarity index 100%
rename from src/libdnssec/dnssec.h
rename to src/libknot/dnssec/dnssec.h

diff --git a/src/libdnssec/error.c b/src/libknot/dnssec/error.c
similarity index 100%
rename from src/libdnssec/error.c
rename to src/libknot/dnssec/error.c

diff --git a/src/libdnssec/error.h b/src/libknot/dnssec/error.h
similarity index 100%
rename from src/libdnssec/error.h
rename to src/libknot/dnssec/error.h

diff --git a/src/libdnssec/key.h b/src/libknot/dnssec/key.h
similarity index 100%
rename from src/libdnssec/key.h
rename to src/libknot/dnssec/key.h

diff --git a/src/libdnssec/key/algorithm.c b/src/libknot/dnssec/key/algorithm.c
similarity index 100%
rename from src/libdnssec/key/algorithm.c
rename to src/libknot/dnssec/key/algorithm.c

diff --git a/src/libdnssec/key/algorithm.h b/src/libknot/dnssec/key/algorithm.h
similarity index 100%
rename from src/libdnssec/key/algorithm.h
rename to src/libknot/dnssec/key/algorithm.h

diff --git a/src/libdnssec/key/convert.c b/src/libknot/dnssec/key/convert.c
similarity index 100%
rename from src/libdnssec/key/convert.c
rename to src/libknot/dnssec/key/convert.c

diff --git a/src/libdnssec/key/convert.h b/src/libknot/dnssec/key/convert.h
similarity index 100%
rename from src/libdnssec/key/convert.h
rename to src/libknot/dnssec/key/convert.h

diff --git a/src/libdnssec/key/dnskey.c b/src/libknot/dnssec/key/dnskey.c
similarity index 100%
rename from src/libdnssec/key/dnskey.c
rename to src/libknot/dnssec/key/dnskey.c

diff --git a/src/libdnssec/key/dnskey.h b/src/libknot/dnssec/key/dnskey.h
similarity index 100%
rename from src/libdnssec/key/dnskey.h
rename to src/libknot/dnssec/key/dnskey.h

diff --git a/src/libdnssec/key/ds.c b/src/libknot/dnssec/key/ds.c
similarity index 100%
rename from src/libdnssec/key/ds.c
rename to src/libknot/dnssec/key/ds.c

diff --git a/src/libdnssec/key/internal.h b/src/libknot/dnssec/key/internal.h
similarity index 100%
rename from src/libdnssec/key/internal.h
rename to src/libknot/dnssec/key/internal.h

diff --git a/src/libdnssec/key/key.c b/src/libknot/dnssec/key/key.c
similarity index 100%
rename from src/libdnssec/key/key.c
rename to src/libknot/dnssec/key/key.c

diff --git a/src/libdnssec/key/keytag.c b/src/libknot/dnssec/key/keytag.c
similarity index 100%
rename from src/libdnssec/key/keytag.c
rename to src/libknot/dnssec/key/keytag.c

diff --git a/src/libdnssec/key/privkey.c b/src/libknot/dnssec/key/privkey.c
similarity index 100%
rename from src/libdnssec/key/privkey.c
rename to src/libknot/dnssec/key/privkey.c

diff --git a/src/libdnssec/key/privkey.h b/src/libknot/dnssec/key/privkey.h
similarity index 100%
rename from src/libdnssec/key/privkey.h
rename to src/libknot/dnssec/key/privkey.h

diff --git a/src/libdnssec/key/simple.c b/src/libknot/dnssec/key/simple.c
similarity index 100%
rename from src/libdnssec/key/simple.c
rename to src/libknot/dnssec/key/simple.c

diff --git a/src/libdnssec/keyid.c b/src/libknot/dnssec/keyid.c
similarity index 100%
rename from src/libdnssec/keyid.c
rename to src/libknot/dnssec/keyid.c

diff --git a/src/libdnssec/keyid.h b/src/libknot/dnssec/keyid.h
similarity index 100%
rename from src/libdnssec/keyid.h
rename to src/libknot/dnssec/keyid.h

diff --git a/src/libdnssec/keystore.h b/src/libknot/dnssec/keystore.h
similarity index 100%
rename from src/libdnssec/keystore.h
rename to src/libknot/dnssec/keystore.h

diff --git a/src/libdnssec/keystore/internal.h b/src/libknot/dnssec/keystore/internal.h
similarity index 100%
rename from src/libdnssec/keystore/internal.h
rename to src/libknot/dnssec/keystore/internal.h

diff --git a/src/libdnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c
similarity index 100%
rename from src/libdnssec/keystore/keystore.c
rename to src/libknot/dnssec/keystore/keystore.c

diff --git a/src/libdnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
similarity index 100%
rename from src/libdnssec/keystore/pkcs11.c
rename to src/libknot/dnssec/keystore/pkcs11.c

diff --git a/src/libdnssec/keystore/pkcs8.c b/src/libknot/dnssec/keystore/pkcs8.c
similarity index 100%
rename from src/libdnssec/keystore/pkcs8.c
rename to src/libknot/dnssec/keystore/pkcs8.c

diff --git a/src/libdnssec/keytag.h b/src/libknot/dnssec/keytag.h
similarity index 100%
rename from src/libdnssec/keytag.h
rename to src/libknot/dnssec/keytag.h

diff --git a/src/libdnssec/nsec.h b/src/libknot/dnssec/nsec.h
similarity index 100%
rename from src/libdnssec/nsec.h
rename to src/libknot/dnssec/nsec.h

diff --git a/src/libdnssec/nsec/bitmap.c b/src/libknot/dnssec/nsec/bitmap.c
similarity index 100%
rename from src/libdnssec/nsec/bitmap.c
rename to src/libknot/dnssec/nsec/bitmap.c

diff --git a/src/libdnssec/nsec/hash.c b/src/libknot/dnssec/nsec/hash.c
similarity index 100%
rename from src/libdnssec/nsec/hash.c
rename to src/libknot/dnssec/nsec/hash.c

diff --git a/src/libdnssec/nsec/nsec.c b/src/libknot/dnssec/nsec/nsec.c
similarity index 100%
rename from src/libdnssec/nsec/nsec.c
rename to src/libknot/dnssec/nsec/nsec.c

diff --git a/src/libdnssec/p11/p11.c b/src/libknot/dnssec/p11/p11.c
similarity index 100%
rename from src/libdnssec/p11/p11.c
rename to src/libknot/dnssec/p11/p11.c

diff --git a/src/libdnssec/p11/p11.h b/src/libknot/dnssec/p11/p11.h
similarity index 100%
rename from src/libdnssec/p11/p11.h
rename to src/libknot/dnssec/p11/p11.h

diff --git a/src/libdnssec/pem.c b/src/libknot/dnssec/pem.c
similarity index 100%
rename from src/libdnssec/pem.c
rename to src/libknot/dnssec/pem.c

diff --git a/src/libdnssec/pem.h b/src/libknot/dnssec/pem.h
similarity index 100%
rename from src/libdnssec/pem.h
rename to src/libknot/dnssec/pem.h

diff --git a/src/libdnssec/random.c b/src/libknot/dnssec/random.c
similarity index 100%
rename from src/libdnssec/random.c
rename to src/libknot/dnssec/random.c

diff --git a/src/libdnssec/random.h b/src/libknot/dnssec/random.h
similarity index 100%
rename from src/libdnssec/random.h
rename to src/libknot/dnssec/random.h

diff --git a/src/libdnssec/sample_keys.h b/src/libknot/dnssec/sample_keys.h
similarity index 100%
rename from src/libdnssec/sample_keys.h
rename to src/libknot/dnssec/sample_keys.h

diff --git a/src/libdnssec/shared/bignum.c b/src/libknot/dnssec/shared/bignum.c
similarity index 100%
rename from src/libdnssec/shared/bignum.c
rename to src/libknot/dnssec/shared/bignum.c

diff --git a/src/libdnssec/shared/bignum.h b/src/libknot/dnssec/shared/bignum.h
similarity index 100%
rename from src/libdnssec/shared/bignum.h
rename to src/libknot/dnssec/shared/bignum.h

diff --git a/src/libdnssec/shared/binary_wire.h b/src/libknot/dnssec/shared/binary_wire.h
similarity index 100%
rename from src/libdnssec/shared/binary_wire.h
rename to src/libknot/dnssec/shared/binary_wire.h

diff --git a/src/libdnssec/shared/dname.c b/src/libknot/dnssec/shared/dname.c
similarity index 100%
rename from src/libdnssec/shared/dname.c
rename to src/libknot/dnssec/shared/dname.c

diff --git a/src/libdnssec/shared/dname.h b/src/libknot/dnssec/shared/dname.h
similarity index 100%
rename from src/libdnssec/shared/dname.h
rename to src/libknot/dnssec/shared/dname.h

diff --git a/src/libdnssec/shared/keyid_gnutls.c b/src/libknot/dnssec/shared/keyid_gnutls.c
similarity index 100%
rename from src/libdnssec/shared/keyid_gnutls.c
rename to src/libknot/dnssec/shared/keyid_gnutls.c

diff --git a/src/libdnssec/shared/keyid_gnutls.h b/src/libknot/dnssec/shared/keyid_gnutls.h
similarity index 100%
rename from src/libdnssec/shared/keyid_gnutls.h
rename to src/libknot/dnssec/shared/keyid_gnutls.h

diff --git a/src/libdnssec/shared/shared.h b/src/libknot/dnssec/shared/shared.h
similarity index 100%
rename from src/libdnssec/shared/shared.h
rename to src/libknot/dnssec/shared/shared.h

diff --git a/src/libdnssec/sign.h b/src/libknot/dnssec/sign.h
similarity index 100%
rename from src/libdnssec/sign.h
rename to src/libknot/dnssec/sign.h

diff --git a/src/libdnssec/sign/der.c b/src/libknot/dnssec/sign/der.c
similarity index 100%
rename from src/libdnssec/sign/der.c
rename to src/libknot/dnssec/sign/der.c

diff --git a/src/libdnssec/sign/der.h b/src/libknot/dnssec/sign/der.h
similarity index 100%
rename from src/libdnssec/sign/der.h
rename to src/libknot/dnssec/sign/der.h

diff --git a/src/libdnssec/sign/sign.c b/src/libknot/dnssec/sign/sign.c
similarity index 100%
rename from src/libdnssec/sign/sign.c
rename to src/libknot/dnssec/sign/sign.c

diff --git a/src/libdnssec/tsig.c b/src/libknot/dnssec/tsig.c
similarity index 100%
rename from src/libdnssec/tsig.c
rename to src/libknot/dnssec/tsig.c

diff --git a/src/libdnssec/tsig.h b/src/libknot/dnssec/tsig.h
similarity index 100%
rename from src/libdnssec/tsig.h
rename to src/libknot/dnssec/tsig.h