Commit 6106a77c authored by Daniel Salzman's avatar Daniel Salzman

utils: move knsec3hash and keymgr from dnssec

parent f78a766d
......@@ -74,15 +74,16 @@
/src/zscanner/version.h
# Binaries
/src/knotc
/src/knotd
/src/knot1to2
/src/kdig
/src/keymgr
/src/khost
/src/knsupdate
/src/knot1to2
/src/knotc
/src/knotd
/src/knsec3hash
/src/rosedb_tool
/src/knsupdate
/src/kzonecheck
/src/rosedb_tool
# Plugin binaries
/src/rosedb_tool
......
......@@ -155,6 +155,7 @@ src/dnssec/shared/path.c
src/dnssec/shared/path.h
src/dnssec/shared/pem.c
src/dnssec/shared/pem.h
src/dnssec/shared/print.h
src/dnssec/shared/shared.h
src/dnssec/shared/strtonum.h
src/dnssec/shared/timestamp.c
......@@ -189,22 +190,6 @@ src/dnssec/tests/shared_wire.c
src/dnssec/tests/sign.c
src/dnssec/tests/sign_der.c
src/dnssec/tests/tsig.c
src/dnssec/utils/cmdparse/command.c
src/dnssec/utils/cmdparse/command.h
src/dnssec/utils/cmdparse/match.h
src/dnssec/utils/cmdparse/parameter.c
src/dnssec/utils/cmdparse/parameter.h
src/dnssec/utils/cmdparse/value.c
src/dnssec/utils/cmdparse/value.h
src/dnssec/utils/keymgr.c
src/dnssec/utils/knsec3hash.c
src/dnssec/utils/legacy/key.c
src/dnssec/utils/legacy/key.h
src/dnssec/utils/legacy/privkey.c
src/dnssec/utils/legacy/privkey.h
src/dnssec/utils/legacy/pubkey.c
src/dnssec/utils/legacy/pubkey.h
src/dnssec/utils/print.h
src/knot/common/evsched.c
src/knot/common/evsched.h
src/knot/common/fdset.c
......@@ -452,6 +437,20 @@ src/utils/kdig/kdig_exec.h
src/utils/kdig/kdig_main.c
src/utils/kdig/kdig_params.c
src/utils/kdig/kdig_params.h
src/utils/keymgr/cmdparse/command.c
src/utils/keymgr/cmdparse/command.h
src/utils/keymgr/cmdparse/match.h
src/utils/keymgr/cmdparse/parameter.c
src/utils/keymgr/cmdparse/parameter.h
src/utils/keymgr/cmdparse/value.c
src/utils/keymgr/cmdparse/value.h
src/utils/keymgr/keymgr.c
src/utils/keymgr/legacy/key.c
src/utils/keymgr/legacy/key.h
src/utils/keymgr/legacy/privkey.c
src/utils/keymgr/legacy/privkey.h
src/utils/keymgr/legacy/pubkey.c
src/utils/keymgr/legacy/pubkey.h
src/utils/khost/khost_main.c
src/utils/khost/khost_params.c
src/utils/khost/khost_params.h
......@@ -476,6 +475,7 @@ src/utils/knotc/main.c
src/utils/knotc/process.c
src/utils/knotc/process.h
src/utils/knotd/main.c
src/utils/knsec3hash/knsec3hash.c
src/utils/knsupdate/knsupdate_exec.c
src/utils/knsupdate/knsupdate_exec.h
src/utils/knsupdate/knsupdate_main.c
......
......@@ -556,7 +556,6 @@ AC_CONFIG_FILES([Makefile
src/contrib/dnstap/Makefile
src/dnssec/Makefile
src/dnssec/tests/Makefile
src/dnssec/utils/Makefile
src/zscanner/Makefile
])
......
......@@ -224,7 +224,7 @@ libknotus_la_LIBADD = libcontrib.la libknot.la
if HAVE_DAEMON
sbin_PROGRAMS = knotc knotd kzonecheck
sbin_PROGRAMS = keymgr knotc knotd kzonecheck
libexec_PROGRAMS = knot1to2
noinst_LTLIBRARIES += libknotd.la libknotus.la
......@@ -232,6 +232,22 @@ EXTRA_DIST += \
utils/knot1to2/cf-lex.l \
utils/knot1to2/cf-parse.y
keymgr_SOURCES = \
utils/keymgr/cmdparse/command.c \
utils/keymgr/cmdparse/command.h \
utils/keymgr/cmdparse/match.h \
utils/keymgr/cmdparse/parameter.c \
utils/keymgr/cmdparse/parameter.h \
utils/keymgr/cmdparse/value.c \
utils/keymgr/cmdparse/value.h \
utils/keymgr/legacy/key.c \
utils/keymgr/legacy/key.h \
utils/keymgr/legacy/privkey.c \
utils/keymgr/legacy/privkey.h \
utils/keymgr/legacy/pubkey.c \
utils/keymgr/legacy/pubkey.h \
utils/keymgr/keymgr.c
knotc_SOURCES = \
utils/knotc/commands.c \
utils/knotc/commands.h \
......@@ -257,6 +273,11 @@ knot1to2_SOURCES = \
utils/knot1to2/main.c \
utils/knot1to2/scheme.h
kzonecheck_SOURCES = \
utils/kzonecheck/main.c \
utils/kzonecheck/zone_check.c \
utils/kzonecheck/zone_check.h
# static: server shared
libknotd_la_SOURCES = \
knot/conf/base.c \
......@@ -400,17 +421,13 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(systemd_CFLAGS) $(liburcu_CFLAGS)
libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS) $(liburcu_LIBS)
libknotd_la_LIBADD = libknot.la libknot-yparser.la zscanner/libzscanner.la $(liburcu_LIBS)
keymgr_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/dnssec/lib/dnssec -I$(srcdir)/dnssec $(gnutls_CFLAGS)
keymgr_LDADD = dnssec/libdnssec.la dnssec/libshared.la zscanner/libzscanner.la $(gnutls_LIBS)
knotd_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS)
knotd_LDADD = libknotd.la $(liburcu_LIBS)
knotc_CPPFLAGS = $(AM_CPPFLAGS) $(libedit_CFLAGS)
knotc_LDADD = libknotd.la libknotus.la $(libedit_LIBS)
knot1to2_LDADD = libcontrib.la
kzonecheck_SOURCES = \
utils/kzonecheck/main.c \
utils/kzonecheck/zone_check.c \
utils/kzonecheck/zone_check.h
kzonecheck_LDADD = libknotd.la
####################################
......@@ -445,7 +462,7 @@ endif # HAVE_DAEMON
if HAVE_UTILS
bin_PROGRAMS = kdig khost knsupdate
bin_PROGRAMS = kdig khost knsec3hash knsupdate
noinst_LTLIBRARIES += libknotus.la
kdig_SOURCES = \
......@@ -464,6 +481,9 @@ khost_SOURCES = \
utils/khost/khost_params.c \
utils/khost/khost_params.h
knsec3hash_SOURCES = \
utils/knsec3hash/knsec3hash.c
knsupdate_SOURCES = \
utils/knsupdate/knsupdate_exec.c \
utils/knsupdate/knsupdate_exec.h \
......@@ -475,6 +495,8 @@ knsupdate_SOURCES = \
kdig_LDADD = $(libidn_LIBS) libknotus.la
khost_LDADD = $(libidn_LIBS) libknotus.la
knsupdate_LDADD = zscanner/libzscanner.la libknotus.la
knsec3hash_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/dnssec/lib/dnssec -I$(srcdir)/dnssec
knsec3hash_LDADD = dnssec/libdnssec.la dnssec/libshared.la
#######################################
# Optional Knot DNS Utilities modules #
......
SUBDIRS = . utils tests
SUBDIRS = . tests
.PHONY: check-compile
check-compile:
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
/Makefile
/Makefile.in
# utilities
/keymgr
/knsec3hash
if HAVE_UTILS
noinst_LTLIBRARIES = libutils.la
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-I$(srcdir)/../shared \
-I$(srcdir)/../lib/dnssec \
-I$(srcdir)/../lib \
-I$(top_srcdir)/src \
$(gnutls_CFLAGS)
libutils_la_LIBADD = \
$(builddir)/../libdnssec.la \
$(builddir)/../libshared.la \
$(top_builddir)/src/zscanner/libzscanner.la
libutils_la_SOURCES = \
cmdparse/command.c \
cmdparse/command.h \
cmdparse/match.h \
cmdparse/parameter.c \
cmdparse/parameter.h \
cmdparse/value.c \
cmdparse/value.h \
legacy/key.c \
legacy/key.h \
legacy/privkey.c \
legacy/privkey.h \
legacy/pubkey.c \
legacy/pubkey.h \
print.h
keymgr_LDADD = \
libutils.la
knsec3hash_LDADD = \
$(builddir)/../libdnssec.la \
$(builddir)/../libshared.la
sbin_PROGRAMS = \
keymgr
bin_PROGRAMS = \
knsec3hash
endif # HAVE_UTILS
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -14,9 +14,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "cmdparse/command.h"
#include "cmdparse/match.h"
#include "print.h"
#include "shared/print.h"
#include "utils/keymgr/cmdparse/command.h"
#include "utils/keymgr/cmdparse/match.h"
#include <assert.h>
#include <string.h>
......
......@@ -14,9 +14,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "cmdparse/match.h"
#include "cmdparse/parameter.h"
#include "print.h"
#include "shared/print.h"
#include "utils/keymgr/cmdparse/match.h"
#include "utils/keymgr/cmdparse/parameter.h"
#include <assert.h>
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -14,10 +14,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "cmdparse/value.h"
#include "dnssec/key.h"
#include "dnssec/tsig.h"
#include "print.h"
#include "shared/print.h"
#include "utils/keymgr/cmdparse/value.h"
#include <assert.h>
#include <ctype.h>
......
......@@ -16,7 +16,7 @@
#pragma once
#include "cmdparse/parameter.h"
#include "utils/keymgr/cmdparse/parameter.h"
/*!
* bool (set only)
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -30,12 +30,12 @@
#include "cmdparse/command.h"
#include "cmdparse/parameter.h"
#include "cmdparse/value.h"
#include "dname.h"
#include "legacy/key.h"
#include "print.h"
#include "shared.h"
#include "strtonum.h"
#include "wire.h"
#include "shared/dname.h"
#include "shared/print.h"
#include "shared/shared.h"
#include "shared/strtonum.h"
#include "shared/wire.h"
#define PROGRAM_NAME "keymgr"
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -23,11 +23,11 @@
#include "dnssec/binary.h"
#include "dnssec/error.h"
#include "dnssec/kasp.h"
#include "legacy/key.h"
#include "legacy/privkey.h"
#include "legacy/pubkey.h"
#include "pem.h"
#include "shared.h"
#include "shared/pem.h"
#include "shared/shared.h"
#include "utils/keymgr/legacy/key.h"
#include "utils/keymgr/legacy/privkey.h"
#include "utils/keymgr/legacy/pubkey.h"
static int rsa_params_to_pem(const legacy_privkey_t *params, dnssec_binary_t *pem)
{
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -19,9 +19,9 @@
#include "dnssec/binary.h"
#include "dnssec/error.h"
#include "legacy/privkey.h"
#include "shared.h"
#include "strtonum.h"
#include "shared/shared.h"
#include "shared/strtonum.h"
#include "utils/keymgr/legacy/privkey.h"
/* -- private key params conversion ---------------------------------------- */
......
......@@ -22,8 +22,7 @@
#include "dnssec/error.h"
#include "dnssec/binary.h"
#include "dnssec/key.h"
#include "legacy/pubkey.h"
#include "utils/keymgr/legacy/pubkey.h"
#define CLASS_IN 1
#define RTYPE_DNSKEY 48
......
/* Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -21,13 +21,13 @@
#include <stdio.h>
#include <string.h>
#include "base32hex.h"
#include "dname.h"
#include "dnssec/error.h"
#include "dnssec/nsec.h"
#include "hex.h"
#include "print.h"
#include "strtonum.h"
#include "shared/base32hex.h"
#include "shared/dname.h"
#include "shared/hex.h"
#include "shared/print.h"
#include "shared/strtonum.h"
#define PROGRAM_NAME "knsec3hash"
......
......@@ -55,7 +55,7 @@ knot_bin = get_binary("KNOT_TEST_KNOT", repo_binary("src/knotd"))
# KNOT_TEST_KNOTC - Knot control binary.
knot_ctl = get_binary("KNOT_TEST_KNOTC", repo_binary("src/knotc"))
# KNOT_TEST_KEYMGR - Knot key management binary.
keymgr_bin = get_binary("KNOT_TEST_KEYMGR", repo_binary("src/dnssec/utils/keymgr"))
keymgr_bin = get_binary("KNOT_TEST_KEYMGR", repo_binary("src/keymgr"))
# KNOT_TEST_BIND - Bind binary.
bind_bin = get_binary("KNOT_TEST_BIND", "named")
# KNOT_TEST_BINDC - Bind control binary.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment