557 lines
19 KiB
Diff
557 lines
19 KiB
Diff
diff --git a/bin/Makefile.in b/bin/Makefile.in
|
|
index 9ad7f62..094775a 100644
|
|
--- a/bin/Makefile.in
|
|
+++ b/bin/Makefile.in
|
|
@@ -11,7 +11,7 @@ srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
top_srcdir = @top_srcdir@
|
|
|
|
-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \
|
|
+SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate check confgen \
|
|
@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
|
|
TARGETS =
|
|
|
|
diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
|
|
index 321058b..5067ee1 100644
|
|
--- a/bin/dnssec-pkcs11/Makefile.in
|
|
+++ b/bin/dnssec-pkcs11/Makefile.in
|
|
@@ -15,17 +15,17 @@ VERSION=@BIND9_VERSION@
|
|
|
|
@BIND9_MAKE_INCLUDES@
|
|
|
|
-CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
|
+CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} @OPENSSL_INCLUDES@
|
|
|
|
CDEFINES = -DVERSION=\"${VERSION}\"
|
|
CWARNINGS =
|
|
|
|
-DNSLIBS = ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
-ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
+DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
+ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
+ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
|
|
-DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
|
-ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
+DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@
|
|
+ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
|
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
|
|
|
@@ -34,11 +34,11 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
|
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
|
|
|
|
# Alphabetically
|
|
-TARGETS = dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \
|
|
- dnssec-importkey@EXEEXT@ dnssec-keyfromlabel@EXEEXT@ \
|
|
- dnssec-keygen@EXEEXT@ dnssec-revoke@EXEEXT@ \
|
|
- dnssec-settime@EXEEXT@ dnssec-signzone@EXEEXT@ \
|
|
- dnssec-verify@EXEEXT@
|
|
+TARGETS = dnssec-cds-pkcs11@EXEEXT@ dnssec-dsfromkey-pkcs11@EXEEXT@ \
|
|
+ dnssec-importkey-pkcs11@EXEEXT@ dnssec-keyfromlabel-pkcs11@EXEEXT@ \
|
|
+ dnssec-keygen-pkcs11@EXEEXT@ dnssec-revoke-pkcs11@EXEEXT@ \
|
|
+ dnssec-settime-pkcs11@EXEEXT@ dnssec-signzone-pkcs11@EXEEXT@ \
|
|
+ dnssec-verify-pkcs11@EXEEXT@
|
|
|
|
OBJS = dnssectool.@O@
|
|
|
|
@@ -61,19 +61,19 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
|
|
|
|
@BIND9_MAKE_RULES@
|
|
|
|
-dnssec-cds@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-cds-pkcs11@EXEEXT@: dnssec-cds.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-cds.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
-dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-dsfromkey-pkcs11@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
-dnssec-keyfromlabel@EXEEXT@: dnssec-keyfromlabel.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-keyfromlabel-pkcs11@EXEEXT@: dnssec-keyfromlabel.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-keyfromlabel.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
-dnssec-keygen@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-keygen-pkcs11@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
@@ -81,7 +81,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
|
|
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
|
|
-c ${srcdir}/dnssec-signzone.c
|
|
|
|
-dnssec-signzone@EXEEXT@: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-signzone-pkcs11@EXEEXT@: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
@@ -89,19 +89,19 @@ dnssec-verify.@O@: dnssec-verify.c
|
|
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
|
|
-c ${srcdir}/dnssec-verify.c
|
|
|
|
-dnssec-verify@EXEEXT@: dnssec-verify.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-verify-pkcs11@EXEEXT@: dnssec-verify.@O@ ${OBJS} ${DEPLIBS}
|
|
export BASEOBJS="dnssec-verify.@O@ ${OBJS}"; \
|
|
${FINALBUILDCMD}
|
|
|
|
-dnssec-revoke@EXEEXT@: dnssec-revoke.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-revoke-pkcs11@EXEEXT@: dnssec-revoke.@O@ ${OBJS} ${DEPLIBS}
|
|
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
|
|
dnssec-revoke.@O@ ${OBJS} ${LIBS}
|
|
|
|
-dnssec-settime@EXEEXT@: dnssec-settime.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-settime-pkcs11@EXEEXT@: dnssec-settime.@O@ ${OBJS} ${DEPLIBS}
|
|
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
|
|
dnssec-settime.@O@ ${OBJS} ${LIBS}
|
|
|
|
-dnssec-importkey@EXEEXT@: dnssec-importkey.@O@ ${OBJS} ${DEPLIBS}
|
|
+dnssec-importkey-pkcs11@EXEEXT@: dnssec-importkey.@O@ ${OBJS} ${DEPLIBS}
|
|
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
|
|
dnssec-importkey.@O@ ${OBJS} ${LIBS}
|
|
|
|
@@ -112,16 +112,14 @@ docclean manclean maintainer-clean::
|
|
|
|
installdirs:
|
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
|
|
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
|
|
|
|
install-man8: ${MANPAGES}
|
|
${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
|
|
|
|
-install:: ${TARGETS} installdirs install-man8
|
|
+install:: ${TARGETS} installdirs
|
|
for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done
|
|
|
|
uninstall::
|
|
- for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
|
|
for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done
|
|
|
|
clean distclean::
|
|
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
|
|
index eecfa76..416e12e 100644
|
|
--- a/bin/named-pkcs11/Makefile.in
|
|
+++ b/bin/named-pkcs11/Makefile.in
|
|
@@ -43,9 +43,9 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
|
|
DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
|
|
|
|
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
|
|
- ${NS_INCLUDES} ${DNS_INCLUDES} \
|
|
+ ${NS_INCLUDES} ${DNS_PKCS11_INCLUDES} \
|
|
${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
|
|
- ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
|
|
+ ${ISC_PKCS11_INCLUDES} ${DLZDRIVER_INCLUDES} \
|
|
${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
|
|
@OPENSSL_INCLUDES@
|
|
|
|
@@ -53,18 +53,18 @@ CDEFINES = @CONTRIB_DLZ@
|
|
|
|
CWARNINGS =
|
|
|
|
-DNSLIBS = ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
+DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
|
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
|
-ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
-ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
+ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
+ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
|
NSLIBS = ../../lib/ns/libns.@A@
|
|
|
|
-DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
|
+DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@
|
|
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
|
ISCCCDEPLIBS = ../../lib/isccc/libisccc.@A@
|
|
-ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
+ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
|
NSDEPLIBS = ../../lib/ns/libns.@A@
|
|
|
|
@@ -73,17 +73,17 @@ DEPLIBS = ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
|
|
|
|
LIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
|
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
|
|
- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
|
|
+ @LIBCAP_LIBS@ \
|
|
@LIBS@
|
|
|
|
NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
|
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
|
|
- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
|
|
+ @LIBCAP_LIBS@ \
|
|
@LIBS@
|
|
|
|
SUBDIRS = unix
|
|
|
|
-TARGETS = named@EXEEXT@ feature-test@EXEEXT@
|
|
+TARGETS = named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@
|
|
|
|
GEOIPLINKOBJS = geoip.@O@
|
|
GEOIP2LINKOBJS = geoip.@O@
|
|
@@ -93,8 +93,7 @@ OBJS = builtin.@O@ config.@O@ control.@O@ \
|
|
@GEOIPLINKOBJS@ @GEOIP2LINKOBJS@ \
|
|
log.@O@ logconf.@O@ main.@O@ \
|
|
server.@O@ statschannel.@O@ \
|
|
- tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \
|
|
- ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
|
|
+ tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@
|
|
|
|
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
|
|
|
|
@@ -108,8 +107,7 @@ SRCS = builtin.c config.c control.c \
|
|
@GEOIPLINKSRCS@ @GEOIP2LINKSRCS@ \
|
|
log.c logconf.c main.c \
|
|
server.c statschannel.c \
|
|
- tkeyconf.c tsigconf.c zoneconf.c \
|
|
- ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
|
|
+ tkeyconf.c tsigconf.c zoneconf.c
|
|
|
|
MANPAGES = named.8 named.conf.5
|
|
|
|
@@ -149,7 +147,7 @@ server.@O@: server.c
|
|
-DPRODUCT=\"${PRODUCT}\" \
|
|
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
|
|
|
|
-named@EXEEXT@: ${OBJS} ${DEPLIBS}
|
|
+named-pkcs11@EXEEXT@: ${OBJS} ${DEPLIBS}
|
|
export MAKE_SYMTABLE="yes"; \
|
|
export BASEOBJS="${OBJS} ${UOBJS}"; \
|
|
${FINALBUILDCMD}
|
|
@@ -159,7 +157,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
|
|
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
|
|
-c ${top_srcdir}/bin/tests/system/feature-test.c
|
|
|
|
-feature-test@EXEEXT@: feature-test.@O@
|
|
+feature-test-pkcs11@EXEEXT@: feature-test.@O@
|
|
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
|
|
-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
|
|
|
|
@@ -192,13 +190,13 @@ install-man8: named.8
|
|
|
|
install-man: install-man5 install-man8
|
|
|
|
-install:: named@EXEEXT@ installdirs install-man
|
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
|
|
+install:: named-pkcs11@EXEEXT@ installdirs install-man
|
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-pkcs11@EXEEXT@ ${DESTDIR}${sbindir}
|
|
|
|
uninstall::
|
|
rm -f ${DESTDIR}${mandir}/man5/named.conf.5
|
|
rm -f ${DESTDIR}${mandir}/man8/named.8
|
|
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
|
|
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-pkcs11@EXEEXT@
|
|
|
|
@DLZ_DRIVER_RULES@
|
|
|
|
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
|
|
index 96aec05..0e542f3 100644
|
|
--- a/bin/pkcs11/Makefile.in
|
|
+++ b/bin/pkcs11/Makefile.in
|
|
@@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@
|
|
|
|
@BIND9_MAKE_INCLUDES@
|
|
|
|
-CINCLUDES = ${ISC_INCLUDES}
|
|
+CINCLUDES = ${ISC_PKCS11_INCLUDES}
|
|
|
|
CDEFINES =
|
|
|
|
-ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
+ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
|
|
-ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
+ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
|
DEPLIBS = ${ISCDEPLIBS}
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 29106cb..3dff344 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1267,12 +1267,14 @@ AC_SUBST(USE_GSSAPI)
|
|
AC_SUBST(DST_GSSAPI_INC)
|
|
AC_SUBST(DNS_GSSAPI_LIBS)
|
|
DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS"
|
|
+DNS_CRYPTO_PK11_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_PK11_LIBS"
|
|
|
|
#
|
|
# Applications linking with libdns also need to link with these libraries.
|
|
#
|
|
|
|
AC_SUBST(DNS_CRYPTO_LIBS)
|
|
+AC_SUBST(DNS_CRYPTO_PK11_LIBS)
|
|
|
|
#
|
|
# was --with-lmdb specified?
|
|
@@ -2542,6 +2544,9 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE)
|
|
AC_SUBST(BIND9_NS_BUILDINCLUDE)
|
|
AC_SUBST(BIND9_BIND9_BUILDINCLUDE)
|
|
AC_SUBST(BIND9_IRS_BUILDINCLUDE)
|
|
+AC_SUBST(BIND9_ISC_PKCS11_BUILDINCLUDE)
|
|
+AC_SUBST(BIND9_DNS_PKCS11_BUILDINCLUDE)
|
|
+AC_SUBST(BIND9_NS_PKCS11_BUILDINCLUDE)
|
|
if test "X$srcdir" != "X"; then
|
|
BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
|
|
BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
|
|
@@ -2550,6 +2555,9 @@ if test "X$srcdir" != "X"; then
|
|
BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include"
|
|
BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
|
|
BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
|
|
+ BIND9_ISC_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc-pkcs11/include"
|
|
+ BIND9_DNS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns-pkcs11/include"
|
|
+ BIND9_NS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns-pkcs11/include"
|
|
else
|
|
BIND9_ISC_BUILDINCLUDE=""
|
|
BIND9_ISCCC_BUILDINCLUDE=""
|
|
@@ -2558,6 +2566,9 @@ else
|
|
BIND9_NS_BUILDINCLUDE=""
|
|
BIND9_BIND9_BUILDINCLUDE=""
|
|
BIND9_IRS_BUILDINCLUDE=""
|
|
+ BIND9_ISC_PKCS11_BUILDINCLUDE=""
|
|
+ BIND9_DNS_PKCS11_BUILDINCLUDE=""
|
|
+ BIND9_NS_PKCS11_BUILDINCLUDE=""
|
|
fi
|
|
|
|
AC_SUBST_FILE(BIND9_MAKE_INCLUDES)
|
|
@@ -3021,8 +3032,11 @@ AC_CONFIG_FILES([
|
|
bin/delv/Makefile
|
|
bin/dig/Makefile
|
|
bin/dnssec/Makefile
|
|
+ bin/dnssec-pkcs11/Makefile
|
|
bin/named/Makefile
|
|
bin/named/unix/Makefile
|
|
+ bin/named-pkcs11/Makefile
|
|
+ bin/named-pkcs11/unix/Makefile
|
|
bin/nsupdate/Makefile
|
|
bin/pkcs11/Makefile
|
|
bin/plugins/Makefile
|
|
@@ -3095,6 +3109,10 @@ AC_CONFIG_FILES([
|
|
lib/dns/include/dns/Makefile
|
|
lib/dns/include/dst/Makefile
|
|
lib/dns/tests/Makefile
|
|
+ lib/dns-pkcs11/Makefile
|
|
+ lib/dns-pkcs11/include/Makefile
|
|
+ lib/dns-pkcs11/include/dns/Makefile
|
|
+ lib/dns-pkcs11/include/dst/Makefile
|
|
lib/irs/Makefile
|
|
lib/irs/include/Makefile
|
|
lib/irs/include/irs/Makefile
|
|
@@ -3115,6 +3133,20 @@ AC_CONFIG_FILES([
|
|
lib/isc/unix/include/Makefile
|
|
lib/isc/unix/include/isc/Makefile
|
|
lib/isc/unix/include/pkcs11/Makefile
|
|
+ lib/isc-pkcs11/pthreads/Makefile
|
|
+ lib/isc-pkcs11/pthreads/include/Makefile
|
|
+ lib/isc-pkcs11/pthreads/include/isc/Makefile
|
|
+ lib/isc-pkcs11/Makefile
|
|
+ lib/isc-pkcs11/include/Makefile
|
|
+ lib/isc-pkcs11/include/isc/Makefile
|
|
+ lib/isc-pkcs11/include/isc/platform.h
|
|
+ lib/isc-pkcs11/include/pk11/Makefile
|
|
+ lib/isc-pkcs11/include/pkcs11/Makefile
|
|
+ lib/isc-pkcs11/tests/Makefile
|
|
+ lib/isc-pkcs11/unix/Makefile
|
|
+ lib/isc-pkcs11/unix/include/Makefile
|
|
+ lib/isc-pkcs11/unix/include/isc/Makefile
|
|
+ lib/isc-pkcs11/unix/include/pkcs11/Makefile
|
|
lib/isccc/Makefile
|
|
lib/isccc/include/Makefile
|
|
lib/isccc/include/isccc/Makefile
|
|
diff --git a/lib/Makefile.in b/lib/Makefile.in
|
|
index ffa2d5a..439d748 100644
|
|
--- a/lib/Makefile.in
|
|
+++ b/lib/Makefile.in
|
|
@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
|
|
# Attempt to disable parallel processing.
|
|
.NOTPARALLEL:
|
|
.NO_PARALLEL:
|
|
-SUBDIRS = isc isccc dns ns isccfg bind9 irs samples
|
|
+SUBDIRS = isc isc-pkcs11 isccc dns dns-pkcs11 ns isccfg bind9 irs samples
|
|
TARGETS =
|
|
|
|
@BIND9_MAKE_RULES@
|
|
diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
|
|
index 60c87a8..50da232 100644
|
|
--- a/lib/dns-pkcs11/Makefile.in
|
|
+++ b/lib/dns-pkcs11/Makefile.in
|
|
@@ -26,17 +26,17 @@ VERSION=@BIND9_VERSION@
|
|
|
|
USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
|
|
|
|
-CINCLUDES = -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
|
|
- ${ISC_INCLUDES} ${MAXMINDDB_CFLAGS} \
|
|
+CINCLUDES = -I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} \
|
|
+ ${ISC_PKCS11_INCLUDES} ${MAXMINDDB_CFLAGS} \
|
|
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
|
|
|
|
CDEFINES = @USE_GSSAPI@ ${USE_ISC_SPNEGO}
|
|
|
|
CWARNINGS =
|
|
|
|
-ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
+ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
|
|
-ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
+ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
|
LIBS = ${MAXMINDDB_LIBS} @LIBS@
|
|
|
|
@@ -138,15 +138,15 @@ version.@O@: version.c
|
|
-DLIBAGE=${LIBAGE} \
|
|
-c ${srcdir}/version.c
|
|
|
|
-libdns.@SA@: ${OBJS}
|
|
+libdns-pkcs11.@SA@: ${OBJS}
|
|
${AR} ${ARFLAGS} $@ ${OBJS}
|
|
${RANLIB} $@
|
|
|
|
-libdns.la: ${OBJS}
|
|
+libdns-pkcs11.la: ${OBJS}
|
|
${LIBTOOL_MODE_LINK} \
|
|
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
|
|
+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-pkcs11.la -rpath ${libdir} \
|
|
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
|
|
- ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
|
|
+ ${OBJS} ${ISCLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS}
|
|
|
|
include: gen
|
|
${MAKE} include/dns/enumtype.h
|
|
@@ -172,27 +172,27 @@ code.h: gen
|
|
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
|
|
|
|
gen: gen.c
|
|
- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
|
|
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc-pkcs11/include \
|
|
${LFS_CFLAGS} ${LFS_LDFLAGS} \
|
|
${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
|
|
${BUILD_LIBS} ${LFS_LIBS}
|
|
|
|
-timestamp: include libdns.@A@
|
|
+timestamp: include libdns-pkcs11.@A@
|
|
touch timestamp
|
|
|
|
-testdirs: libdns.@A@
|
|
+testdirs: libdns-pkcs11.@A@
|
|
|
|
installdirs:
|
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
|
|
|
install:: timestamp installdirs
|
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns.@A@ ${DESTDIR}${libdir}
|
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns-pkcs11.@A@ ${DESTDIR}${libdir}
|
|
|
|
uninstall::
|
|
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns.@A@
|
|
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns-pkcs11.@A@
|
|
|
|
clean distclean::
|
|
- rm -f libdns.@A@ timestamp
|
|
+ rm -f libdns-pkcs11.@A@ timestamp
|
|
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
|
|
rm -f include/dns/rdatastruct.h
|
|
rm -f dnstap.pb-c.c dnstap.pb-c.h
|
|
diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
|
|
index ed87279..3171b48 100644
|
|
--- a/lib/isc-pkcs11/Makefile.in
|
|
+++ b/lib/isc-pkcs11/Makefile.in
|
|
@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
|
|
CINCLUDES = -I${srcdir}/unix/include \
|
|
-I${srcdir}/pthreads/include \
|
|
-I./include \
|
|
- -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@
|
|
+ -I${srcdir}/include ${DNS_PKCS11_INCLUDES} @OPENSSL_INCLUDES@
|
|
CDEFINES =
|
|
CWARNINGS =
|
|
|
|
@@ -94,40 +94,40 @@ version.@O@: version.c
|
|
-DLIBAGE=${LIBAGE} \
|
|
-c ${srcdir}/version.c
|
|
|
|
-libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
|
|
+libisc-pkcs11.@SA@: ${OBJS} ${SYMTBLOBJS}
|
|
${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
|
|
${RANLIB} $@
|
|
|
|
-libisc-nosymtbl.@SA@: ${OBJS}
|
|
+libisc-pkcs11-nosymtbl.@SA@: ${OBJS}
|
|
${AR} ${ARFLAGS} $@ ${OBJS}
|
|
${RANLIB} $@
|
|
|
|
-libisc.la: ${OBJS} ${SYMTBLOBJS}
|
|
+libisc-pkcs11.la: ${OBJS} ${SYMTBLOBJS}
|
|
${LIBTOOL_MODE_LINK} \
|
|
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
|
|
+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-pkcs11.la -rpath ${libdir} \
|
|
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
|
|
${OBJS} ${SYMTBLOBJS} ${LIBS}
|
|
|
|
-libisc-nosymtbl.la: ${OBJS}
|
|
+libisc-pkcs11-nosymtbl.la: ${OBJS}
|
|
${LIBTOOL_MODE_LINK} \
|
|
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
|
|
+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-pkcs11-nosymtbl.la -rpath ${libdir} \
|
|
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
|
|
${OBJS} ${LIBS}
|
|
|
|
-timestamp: libisc.@A@ libisc-nosymtbl.@A@
|
|
+timestamp: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@
|
|
touch timestamp
|
|
|
|
-testdirs: libisc.@A@ libisc-nosymtbl.@A@
|
|
+testdirs: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@
|
|
|
|
installdirs:
|
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
|
|
|
|
install:: timestamp installdirs
|
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir}
|
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc-pkcs11.@A@ ${DESTDIR}${libdir}
|
|
|
|
uninstall::
|
|
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@
|
|
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc-pkcs11.@A@
|
|
|
|
clean distclean::
|
|
- rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
|
|
- libisc-nosymtbl.la timestamp
|
|
+ rm -f libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ libisc-pkcs11.la \
|
|
+ libisc-pkcs11-nosymtbl.la timestamp
|
|
diff --git a/lib/isc-pkcs11/tests/Makefile.in b/lib/isc-pkcs11/tests/Makefile.in
|
|
index 5735829..7e62737 100644
|
|
--- a/lib/isc-pkcs11/tests/Makefile.in
|
|
+++ b/lib/isc-pkcs11/tests/Makefile.in
|
|
@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
|
|
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
|
CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\""
|
|
|
|
-ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@
|
|
+ISCLIBS = ../libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
ISCDEPLIBS = ../libisc.@A@
|
|
|
|
LIBS = @LIBS@ @CMOCKA_LIBS@
|
|
diff --git a/make/includes.in b/make/includes.in
|
|
index 48cdaf7..6e6572b 100644
|
|
--- a/make/includes.in
|
|
+++ b/make/includes.in
|
|
@@ -39,3 +39,16 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
|
|
|
|
TEST_INCLUDES = \
|
|
-I${top_srcdir}/lib/tests/include
|
|
+
|
|
+ISC_PKCS11_INCLUDES = @BIND9_ISC_PKCS11_BUILDINCLUDE@ \
|
|
+ -I${top_srcdir}/lib/isc-pkcs11 \
|
|
+ -I${top_srcdir}/lib/isc-pkcs11/include \
|
|
+ -I${top_srcdir}/lib/isc-pkcs11/unix/include \
|
|
+ -I${top_srcdir}/lib/isc-pkcs11/pthreads/include
|
|
+
|
|
+DNS_PKCS11_INCLUDES = @BIND9_DNS_PKCS11_BUILDINCLUDE@ \
|
|
+ -I${top_srcdir}/lib/dns-pkcs11/include
|
|
+
|
|
+NS_PKCS11_INCLUDES = @BIND9_NS_PKCS11_BUILDINCLUDE@ \
|
|
+ -I${top_srcdir}/lib/ns-pkcs11/include
|
|
+
|