[master] merge libiscpk11 to libisc

3735.	[cleanup]	Merged the libiscpk11 library into libisc
			to simplify dependencies. [RT #35205]

CHANGES

@@ -1,3 +1,6 @@
+3735.	[cleanup]	Merged the libiscpk11 library into libisc
+			to simplify dependencies. [RT #35205]
+
 3734.	[bug]		Improve building with libtool. [RT #35314]
 
 3733.	[func]		Improve interface scanning support.  Interface

bin/check/Makefile.in

@@ -24,7 +24,7 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
-		${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+		${ISC_INCLUDES}
 
 CDEFINES = 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
@@ -34,13 +34,11 @@ ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 BIND9LIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
 LIBS =		${ISCLIBS} @LIBS@
 NOSYMLIBS =	${ISCNOSYMLIBS} @LIBS@
@@ -72,15 +70,14 @@ named-checkzone.@O@: named-checkzone.c
 		-c ${srcdir}/named-checkzone.c
 
 named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \
-		${ISCCFGDEPLIBS} ${BIND9DEPLIBS} ${ISCPK11DEPLIBS}
+		${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
 	export BASEOBJS="named-checkconf.@O@ check-tool.@O@"; \
-	export LIBS0="${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCPK11LIBS}"; \
+	export LIBS0="${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
-named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ \
+named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	export BASEOBJS="named-checkzone.@O@ check-tool.@O@"; \
-	export LIBS0="${ISCCFGLIBS} ${DNSLIBS} ${ISCPK11LIBS}"; \
+	export LIBS0="${ISCCFGLIBS} ${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}

bin/confgen/Makefile.in

@@ -23,8 +23,7 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
-	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
+	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
-	${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -35,25 +34,21 @@ ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
-RNDCLIBS =	${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} \
+RNDCLIBS =	${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
-		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+RNDCDEPLIBS =	${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-RNDCDEPLIBS =	${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} \
-		${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
-NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
 
-CONFDEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+CONFDEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
 SRCS=		rndc-confgen.c ddns-confgen.c
 

bin/dig/Makefile.in

@@ -26,8 +26,7 @@ top_srcdir =	@top_srcdir@
 READLINE_LIB = @READLINE_LIB@
 
 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES} \
+		${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -38,17 +37,15 @@ BIND9LIBS =	../../lib/bind9/libbind9.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
 DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \
-		${ISCPK11DEPLIBS} ${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
+		${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
 
 LIBS =		${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
 		${ISCLIBS} @IDNLIBS@ @LIBS@
@@ -76,17 +73,17 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${ISCPK11LIBS}"; \
+	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	export BASEOBJS="host.@O@ dighost.@O@ ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${ISCPK11LIBS}"; \
+	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	export BASEOBJS="nslookup.@O@ dighost.@O@ ${READLINE_LIB} ${UOBJS}"; \
-	export LIBS0="${DNSLIBS} ${ISCPK11LIBS}"; \
+	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}

bin/dnssec/Makefile.in

@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =	-DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
 		@CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
@@ -32,17 +32,15 @@ CWARNINGS =
 DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
-NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+NOSYMLIBS =	${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
 
 # Alphabetically
 TARGETS =	dnssec-keygen@EXEEXT@ dnssec-signzone@EXEEXT@ \

bin/dnssec/dnssectool.c

@@ -330,7 +330,7 @@ strtotime(const char *str, isc_int64_t now, isc_int64_t base,
 	isc_result_t result;
 	const char *orig = str;
 	char *endp;
-	int n;
+	size_t n;
 
 	if (isnone(str)) {
 		if (setp != NULL)

bin/named/Makefile.in

@@ -49,7 +49,6 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
 CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
-		${ISCPK11_INCLUDES} \
 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
@@ -63,7 +62,6 @@ ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
 BIND9LIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
@@ -71,20 +69,16 @@ ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
 DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
-		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS} \
+		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
-		${ISCPK11DEPLIBS}
 
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
-		${ISCPK11LIBS} \
 		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 
 NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
-		${ISCPK11LIBS} \
 		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 
 SUBDIRS =	unix

bin/named/server.c

@@ -9329,7 +9329,7 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
 
 static isc_result_t
 putstr(isc_buffer_t *b, const char *str) {
-	size_t l = strlen(str);
+	unsigned int l = strlen(str);
 
 	/*
 	 * Use >= to leave space for NUL termination.

bin/named/win32/named.dsp.in

@@ -42,11 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-@IF PKCS11
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-@ELSE PKCS11
 # ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-@END PKCS11
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -70,11 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-@IF PKCS11
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
-@ELSE PKCS11
 # ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
-@END PKCS11
 # SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"

bin/named/win32/named.mak.in

@@ -166,11 +166,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-@IF PKCS11
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@ELSE PKCS11
 CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@END PKCS11
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
 BSC32_SBRS= \
@@ -329,11 +325,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-@IF PKCS11
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@ELSE PKCS11
 CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @CRYPTO@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@END PKCS11
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
 BSC32_SBRS= \

bin/named/win32/named.vcxproj.in

@@ -60,11 +60,7 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-@IF PKCS11
-      <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\win32\include;..\..\..\lib\iscpk11\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@ELSE PKCS11
       <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@END PKCS11
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -90,11 +86,7 @@
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@IF PKCS11
-      <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\win32\include;..\..\..\lib\iscpk11\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@ELSE PKCS11
       <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@END PKCS11
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bin/nsupdate/Makefile.in

@@ -28,8 +28,7 @@ READLINE_LIB = @READLINE_LIB@
 DST_GSSAPI_INC = @DST_GSSAPI_INC@
 
 CINCLUDES =	${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISC_INCLUDES} ${ISCCFG_INCLUDES} ${ISCPK11_INCLUDES} \
+		${ISC_INCLUDES} ${ISCCFG_INCLUDES} ${DST_GSSAPI_INC}
-		${DST_GSSAPI_INC}
 
 CDEFINES =	@USE_GSSAPI@
 CWARNINGS =
@@ -40,23 +39,18 @@ BIND9LIBS =	../../lib/bind9/libbind9.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \
+DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
-		${ISCPK11DEPLIBS}
 
-LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
 
-NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-		${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
 
 SUBDIRS =
 

bin/pkcs11/Makefile.in

@@ -20,14 +20,14 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${ISC_INCLUDES}
 
 CDEFINES =
 
 ISCLIBS =	../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
-LIBS =		${ISCPK11LIBS} ${ISCLIBS} @LIBS@
+# if FORCE_STATIC_PROVIDER: LIBS += ${PROVIDER}
+LIBS =		${ISCLIBS} @LIBS@
 
 SUBDIRS =	benchmarks
 

bin/pkcs11/pkcs11-destroy.c

@@ -60,7 +60,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #ifdef WIN32
 #define sleep(x)	Sleep(x)
@@ -78,7 +78,7 @@ main(int argc, char *argv[]) {
 	CK_SESSION_HANDLE hSession;
 	CK_BYTE attr_id[2];
 	CK_OBJECT_HANDLE akey[50];
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *label = NULL;
 	char *pin = NULL;

bin/pkcs11/pkcs11-keygen.c

@@ -67,10 +67,10 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #define WANT_DH_PRIMES
 #define WANT_ECC_CURVES
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -273,7 +273,7 @@ main(int argc, char *argv[]) {
 	CK_OBJECT_HANDLE privatekey, publickey, domainparams;
 	CK_BYTE exponent[5];
 	CK_ULONG expsize = 0;
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	int error = 0;
 	int c, errflg = 0;
 	int hide = 1, special = 0, quiet = 0;

bin/pkcs11/pkcs11-list.c

@@ -57,7 +57,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)		getpass(x)
@@ -71,7 +71,7 @@ main(int argc, char *argv[]) {
 	CK_SESSION_HANDLE hSession;
 	CK_BYTE attr_id[2];
 	CK_OBJECT_HANDLE akey[50];
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *label = NULL;
 	char *pin = NULL;

bin/pkcs11/pkcs11-tokens.c

@@ -34,7 +34,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 extern void dst__pkcs11_init(isc_mem_t *mctx, const char *engine);
 

bin/pkcs11/win32/pk11destroy.dsp.in

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe"
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe"
 
 !ELSEIF  "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"
 
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
 # SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept
 
 !ENDIF 
 

bin/pkcs11/win32/pk11destroy.mak.in

@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11destroy.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11destroy.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11destroy.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe" 
 LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"
 
 "..\..\..\Build\Release\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-destroy.sbr"
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept 
 LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"
 
 "..\..\..\Build\Debug\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

bin/pkcs11/win32/pk11destroy.vcxproj.in

@@ -61,14 +61,14 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -87,7 +87,7 @@
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -96,8 +96,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

bin/pkcs11/win32/pk11keygen.dsp.in

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe"
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe"
 
 !ELSEIF  "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"
 
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
 # SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept
 
 !ENDIF 
 

bin/pkcs11/win32/pk11keygen.mak.in

@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11keygen.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe" 
 LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"
 
 "..\..\..\Build\Release\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-keygen.sbr"
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept 
 LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"
 
 "..\..\..\Build\Debug\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

bin/pkcs11/win32/pk11keygen.vcxproj.in

@@ -62,14 +62,14 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -88,7 +88,7 @@
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -97,8 +97,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

bin/pkcs11/win32/pk11list.dsp.in

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe"
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe"
 
 !ELSEIF  "$(CFG)" == "pk11list - @PLATFORM@ Debug"
 
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
 # SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept
 
 !ENDIF 
 

bin/pkcs11/win32/pk11list.mak.in

@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11list.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11list.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11list.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-list.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-list.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe" 
 LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"
 
 "..\..\..\Build\Release\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-list.sbr"
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-list.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-list.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept 
 LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"
 
 "..\..\..\Build\Debug\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

bin/pkcs11/win32/pk11list.vcxproj.in

@@ -62,14 +62,14 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -88,7 +88,7 @@
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -97,8 +97,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

bin/pkcs11/win32/pk11tokens.dsp.in

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe"
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe"
 
 !ELSEIF  "$(CFG)" == "pk11tokens - @PLATFORM@ Debug"
 
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c
 # SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept
 
 !ENDIF 
 

bin/pkcs11/win32/pk11tokens.mak.in

@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11tokens.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11tokens.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11tokens.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/iscpk11/win32/Release/libiscpk11.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe" 
 LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj"
 
 "..\..\..\Build\Release\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/include" /I "../../../lib/iscpk11/win32/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." @LIBXML2_INC@ /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-tokens.sbr"
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/iscpk11/win32/Debug/libiscpk11.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-tokens.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-tokens.exe" /pdbtype:sept 
 LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj"
 
 "..\..\..\Build\Debug\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

bin/pkcs11/win32/pk11tokens.vcxproj.in

@@ -61,14 +61,14 @@
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
@@ -87,7 +87,7 @@
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>.\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -96,8 +96,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

bin/rndc/Makefile.in

@@ -24,8 +24,7 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
-	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
+	${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
-	${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -36,20 +35,17 @@ ISCLIBS =	../../lib/isc/libisc.@A@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
 
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
-NOSYMLIBS =	${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+NOSYMLIBS =	${ISCNOSYMLIBS} @LIBS@
 
-RNDCDEPLIBS =	${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} \
+RNDCDEPLIBS =	${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-		${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
 
 CONFDEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 

bin/tests/Makefile.in

@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-		${LWRES_INCLUDES} ${ISCPK11_INCLUDES} ${OMAPI_INCLUDES}
+		${LWRES_INCLUDES} ${OMAPI_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -33,14 +33,12 @@ ISCLIBS =	../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS = 	../../lib/isccfg/libisccfg.@A@
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11LIBS = 	../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
 LIBS =		@LIBS@
 
@@ -144,13 +142,13 @@ BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
 
 all_tests: ${XTARGETS}
 
-adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-backtrace_test_nosymtbl@EXEEXT@: backtrace_test.c ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+backtrace_test_nosymtbl@EXEEXT@: backtrace_test.c ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
-	backtrace_test.c ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+	backtrace_test.c ${ISCLIBS} ${LIBS}
 
 backtrace_test@EXEEXT@: backtrace_test_nosymtbl@EXEEXT@
 	#first step: create a first symbol table
@@ -174,149 +172,149 @@ backtrace_test@EXEEXT@: backtrace_test_nosymtbl@EXEEXT@
 	-o $@ backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
 	rm -f symtbl.c
 
-nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rdata_test@EXEEXT@: rdata_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+rdata_test@EXEEXT@: rdata_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rdata_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-wire_test@EXEEXT@: wire_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+wire_test@EXEEXT@: wire_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ printmsg.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-compress_test@EXEEXT@: compress_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+compress_test@EXEEXT@: compress_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ compress_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
-		${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCLIBS} ${LIBS}
 
-lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${LWRESDEPLIBS}
+lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwresconf_test.@O@ \
-		${LWRESLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${LWRESDEPLIBS}
+lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwres_test.@O@ \
-		${LWRESLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
 gxbn_test@EXEEXT@: gxbn_test.@O@ ${LWRESDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxbn_test.@O@ \
-		${LWRESLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
 gxba_test@EXEEXT@: gxba_test.@O@ ${LWRESDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxba_test.@O@ \
-		${LWRESLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS} ${DNSDEPLIBS}
+sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ cfg_test.@O@ \
-		${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 makejournal@EXEEXT@: makejournal.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ makejournal.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 distclean::
 	rm -f headerdep_test.sh

bin/tests/atomic/Makefile.in

@@ -26,14 +26,12 @@ CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${ISCDEPLIBS}
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/db/Makefile.in

@@ -21,8 +21,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
+CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -30,16 +29,14 @@ CWARNINGS =
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 ISCCFGLIBS = 	../../../lib/isccfg/libisccfg.@A@
-ISCPK11LIBS = 	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/dst/Makefile.in

@@ -22,22 +22,20 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} \
-		${ISC_INCLUDES} ${ISCPK11_INCLUDES} @DST_GSSAPI_INC@
+		${ISC_INCLUDES} @DST_GSSAPI_INC@
 
 CDEFINES =	@USE_GSSAPI@
 CWARNINGS =
 
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/hashes/Makefile.in

@@ -20,20 +20,18 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${ISCDEPLIBS}
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} ${ISCLIBS} @LIBS@
+LIBS =		${ISCLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/master/Makefile.in

@@ -21,8 +21,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
+CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -30,15 +29,13 @@ CWARNINGS =
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/mem/Makefile.in

@@ -27,16 +27,14 @@ CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
 
-DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${TAPILIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_mem@EXEEXT@
 

bin/tests/names/Makefile.in

@@ -21,8 +21,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
+CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -30,15 +29,13 @@ CWARNINGS =
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/net/Makefile.in

@@ -27,14 +27,12 @@ CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${ISCDEPLIBS}
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 TARGETS =	t_net@EXEEXT@
 

bin/tests/pkcs11/Makefile.in

@@ -20,14 +20,13 @@ top_srcdir =	@top_srcdir@
 
 PROVIDER =	@PKCS11_PROVIDER@
 
-CINCLUDES =	${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${ISC_INCLUDES}
 
 CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\"
 
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
-LIBS =		${ISCPK11LIBS} ${ISCLIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 SUBDIRS =	benchmarks
 

bin/tests/pkcs11/benchmarks/Makefile.in

@@ -22,14 +22,13 @@ top_srcdir =	@top_srcdir@
 
 PROVIDER =	@PKCS11_PROVIDER@
 
-CINCLUDES =	${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${ISC_INCLUDES}
 
 CDEFINES =	-DPK11_LIB_LOCATION=\"${PROVIDER}\"
 
 ISCLIBS =	../../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../../lib/iscpk11/libiscpk11.@A@
 
-LIBS =		${ISCPK11LIBS} ${ISCLIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 SUBDIRS =
 

bin/tests/pkcs11/benchmarks/create.c

@@ -57,7 +57,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -106,7 +106,7 @@ main(int argc, char *argv[]) {
 		{ CKA_LABEL, (CK_BYTE_PTR) label, (CK_ULONG) sizeof(label) },
 		{ CKA_VALUE, buf, (CK_ULONG) sizeof(buf) }
 	};
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/find.c

@@ -54,7 +54,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -94,7 +94,7 @@ main(int argc, char *argv[]) {
 	};
 	CK_OBJECT_HANDLE sKey = CK_INVALID_HANDLE;
 	CK_ULONG found = 0;
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/genrsa.c

@@ -56,7 +56,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
 		{ CKA_PRIVATE, &truevalue, (CK_ULONG) sizeof(truevalue) },
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
 	};
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/login.c

@@ -56,8 +56,8 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)

bin/tests/pkcs11/benchmarks/privrsa.c

@@ -57,7 +57,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -208,7 +208,7 @@ main(int argc, char *argv[]) {
 		{ CKA_EXPONENT_2, exp_2, (CK_ULONG) sizeof(exp_2) },
 		{ CKA_COEFFICIENT, coeff, (CK_ULONG) sizeof(coeff) }
 	};
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/pubrsa.c

@@ -57,7 +57,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -129,7 +129,7 @@ main(int argc, char *argv[]) {
 		{ CKA_MODULUS, modulus, (CK_ULONG) sizeof(modulus) },
 		{ CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG) sizeof(exponent) }
 	};
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/random.c

@@ -56,7 +56,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #ifndef HAVE_CLOCK_GETTIME
 #ifndef CLOCK_REALTIME
@@ -87,7 +87,7 @@ main(int argc, char *argv[]) {
 	CK_SLOT_ID slot = 0;
 	CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE;
 	CK_ULONG len = sizeof(buf);
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	int error = 0;
 	int c, errflg = 0;

bin/tests/pkcs11/benchmarks/session.c

@@ -56,8 +56,8 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 
 #ifndef HAVE_CLOCK_GETTIME
 #ifndef CLOCK_REALTIME

bin/tests/pkcs11/benchmarks/sha1.c

@@ -56,7 +56,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #ifndef HAVE_CLOCK_GETTIME
 #ifndef CLOCK_REALTIME
@@ -88,7 +88,7 @@ main(int argc, char *argv[]) {
 	CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE;
 	CK_MECHANISM mech = { CKM_SHA_1, NULL, 0 };
 	CK_ULONG len = sizeof(buf);
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	int error = 0;
 	int c, errflg = 0;

bin/tests/pkcs11/benchmarks/sign.c

@@ -56,7 +56,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -210,7 +210,7 @@ main(int argc, char *argv[]) {
 		{ CKA_COEFFICIENT, coeff, (CK_ULONG) sizeof(coeff) }
 	};
 	CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 };
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/benchmarks/verify.c

@@ -56,7 +56,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -131,7 +131,7 @@ main(int argc, char *argv[]) {
 		{ CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG) sizeof(exponent) }
 	};
 	CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 };
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/pkcs11-hmacmd5.c

@@ -71,7 +71,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -106,7 +106,7 @@ main(int argc, char *argv[]) {
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
 		{ CKA_VALUE, NULL, 0 }
 	};
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/pkcs11/pkcs11-md5sum.c

@@ -70,7 +70,7 @@
 #include <isc/result.h>
 #include <isc/types.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
 #if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
 #define getpassphrase(x)	getpass(x)
@@ -89,7 +89,7 @@ main(int argc, char *argv[]) {
 	CK_SESSION_HANDLE hSession;
 	CK_MECHANISM mech = { CKM_MD5, NULL, 0 };
 	CK_ULONG len;
-	iscpk11_context_t pctx;
+	pk11_context_t pctx;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	int error = 0;

bin/tests/rbt/Makefile.in

@@ -21,8 +21,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
+CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -30,15 +29,13 @@ CWARNINGS =
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/resolver/Makefile.in

@@ -20,8 +20,7 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
+CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-		${ISCPK11_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -29,15 +28,13 @@ CWARNINGS =
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tests/sockaddr/Makefile.in

@@ -21,22 +21,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${TAPILIBS} ${ISCLIBS} ${ISCPK11LIBS} ${ISCLIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_sockaddr@EXEEXT@
 

bin/tests/system/lwresd/Makefile.in

@@ -23,22 +23,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${LWRES_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${LWRES_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 LWRESLIBS =	../../../../lib/lwres/liblwres.@A@
 ISCLIBS =	../../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../../lib/iscpk11/libiscpk11.@A@
 
 LWRESDEPLIBS =	../../../../lib/lwres/liblwres.@A@
 ISCDEPLIBS =	../../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${LWRESDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${LWRESDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${LWRESLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${LWRESLIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	lwtest@EXEEXT@
 

bin/tests/system/tkey/Makefile.in

@@ -23,22 +23,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 DNSLIBS =	../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../../lib/isc/libisc.@A@
-ISCPK11LIBS =	../../../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	keycreate@EXEEXT@ keydelete@EXEEXT@
 

bin/tests/tasks/Makefile.in

@@ -21,22 +21,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =		${TAPILIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_tasks@EXEEXT@
 

bin/tests/timers/Makefile.in

@@ -21,20 +21,18 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
 ISCLIBS =	../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
-ISCPK11LIBS =	../../../lib/iscpk11/libiscpk11.@A@
 
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
-ISCPK11DEPLIBS = ../../../lib/iscpk11/libiscpk11.@A@
 
-DEPLIBS =	${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+DEPLIBS =	${ISCDEPLIBS}
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 

bin/tools/Makefile.in

@@ -21,7 +21,7 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-		${LWRES_INCLUDES} ${ISCPK_11INCLUDES} ${OMAPI_INCLUDES}
+		${LWRES_INCLUDES} ${OMAPI_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -31,16 +31,14 @@ ISCLIBS =	../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
 ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGLIBS = 	../../lib/isccfg/libisccfg.@A@
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11LIBS = 	../../lib/iscpk11/libiscpk11.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
 
-LIBS =		${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
-NOSYMLIBS =	${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+NOSYMLIBS =	${ISCNOSYMLIBS} @LIBS@
 
 SUBDIRS = 
 
@@ -58,28 +56,26 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
 
-arpaname@EXEEXT@: arpaname.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+arpaname@EXEEXT@: arpaname.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
 		-o $@ arpaname.@O@ ${ISCLIBS} ${LIBS}
 
-named-journalprint@EXEEXT@: named-journalprint.@O@ ${ISCDEPLIBS} \
+named-journalprint@EXEEXT@: named-journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	export BASEOBJS="named-journalprint.@O@"; \
 	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
-named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} \
+named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	export BASEOBJS="named-rrchecker.@O@"; \
 	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
-nsec3hash@EXEEXT@: nsec3hash.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+nsec3hash@EXEEXT@: nsec3hash.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	export BASEOBJS="nsec3hash.@O@"; \
 	export LIBS0="${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
-isc-hmac-fixup@EXEEXT@: isc-hmac-fixup.@O@ ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+isc-hmac-fixup@EXEEXT@: isc-hmac-fixup.@O@ ${ISCDEPLIBS}
 	export BASEOBJS="isc-hmac-fixup.@O@"; \
 	export LIBS0="${ISCLIBS}"; \
 	${FINALBUILDCMD}

bin/win32/BINDInstall/BINDInstallDlg.cpp

@@ -131,9 +131,6 @@ const FileData installFiles[] =
 	{"libisc.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
 	{"libisccfg.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
 	{"libisccc.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
-#ifdef USE_PKCS11
-	{"libiscpk11.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
-#endif
 	{"libdns.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
 	{"liblwres.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
 #ifdef OPENSSL

configure

@@ -676,7 +676,6 @@ BIND9_DNS_BUILDINCLUDE
 BIND9_ISCCFG_BUILDINCLUDE
 BIND9_ISCCC_BUILDINCLUDE
 BIND9_ISC_BUILDINCLUDE
-BIND9_ISCPK11_BUILDINCLUDE
 BIND9_TOP_BUILDDIR
 UNITTESTS
 ATFLIBS
@@ -805,6 +804,12 @@ CRYPTO
 PKCS11LINKSRCS
 PKCS11LINKOBJS
 PKCS11_PROVIDER
+ISC_ISCPK11_API_O
+ISC_ISCPK11_API_C
+ISC_PK11_API_O
+ISC_PK11_API_C
+ISC_PK11_O
+ISC_PK11_C
 PKCS11_ENGINE
 PKCS11_TOOLS
 USE_PKCS11
@@ -940,7 +945,6 @@ PATH_SEPARATOR
 SHELL'
 ac_subst_files='BIND9_MAKE_INCLUDES
 BIND9_MAKE_RULES
-LIBISCPK11_API
 LIBISC_API
 LIBISCCC_API
 LIBISCCFG_API
@@ -969,6 +973,7 @@ with_geoip
 with_gssapi
 with_randomdev
 enable_threads
+with_libtool
 enable_native_pkcs11
 with_openssl
 with_pkcs11
@@ -980,7 +985,6 @@ with_libxml2
 with_libjson
 enable_largefile
 with_purify
-with_libtool
 enable_backtrace
 enable_symtable
 enable_ipv6
@@ -1679,6 +1683,7 @@ Optional Packages:
   --with-geoip=PATH       Build with GeoIP support (yes|no|path)
   --with-gssapi=PATH      Specify path for system-supplied GSSAPI [default=yes]
   --with-randomdev=PATH   Specify path for random device
+  --with-libtool          use GNU libtool
   --with-openssl=PATH     Build with OpenSSL yes|no|path.
 			  (Crypto is required for DNSSEC)
   --with-pkcs11=PATH      Build with PKCS11 support yes|no|path
@@ -1688,7 +1693,6 @@ Optional Packages:
   --with-libxml2=PATH     Build with libxml2 library yes|no|path
   --with-libjson=PATH     Build with libjson0 library yes|no|path
   --with-purify=PATH      use Rational purify
-  --with-libtool          use GNU libtool
   --with-kame=PATH	  use Kame IPv6 default path /usr/local/v6
   --with-readline=LIBSPEC    specify readline library default -lreadline
 
@@ -15041,6 +15045,46 @@ fi
 ISC_THREAD_DIR=$thread_dir
 
 
+
+# Check whether --with-libtool was given.
+if test "${with_libtool+set}" = set; then :
+  withval=$with_libtool; use_libtool="$withval"
+else
+  use_libtool="no"
+fi
+
+
+case $use_libtool in
+	yes)
+
+		O=lo
+		A=la
+		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
+		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+		case "$host" in
+		*) LIBTOOL_ALLOW_UNDEFINED= ;;
+		esac
+		case "$host" in
+		*-ibm-aix*) LIBTOOL_IN_MAIN="-Wl,-bI:T_testlist.imp" ;;
+		*) LIBTOOL_IN_MAIN= ;;
+		esac;
+		;;
+	*)
+		O=o
+		A=a
+		LIBTOOL=
+
+		LIBTOOL_MKDEP_SED=
+		LIBTOOL_MODE_COMPILE=
+		LIBTOOL_MODE_INSTALL=
+		LIBTOOL_MODE_LINK=
+		LIBTOOL_ALLOW_UNDEFINED=
+		LIBTOOL_IN_MAIN=
+		;;
+esac
+
 #
 # was --enable-native-pkcs11 specified?
 #  (note it implies both --without-openssl and --with-pkcs11)
@@ -15608,9 +15652,15 @@ case "$use_pkcs11" in
 	no)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-		USE_PKCS11=''
+		USE_PKCS11=""
-		PKCS11_TEST=''
+		PKCS11_TEST=""
-		PKCS11_TOOLS=''
+		PKCS11_TOOLS=""
+		ISC_PK11_C=""
+		ISC_PK11_O=""
+		ISC_PK11_API_C=""
+		ISC_PK11_API_O=""
+		ISC_ISCPK11_API_C=""
+		ISC_ISCPK11_API_O=""
 		;;
 	yes|*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -15683,12 +15733,24 @@ if test "x$ac_cv_func_getpassphrase" = xyes; then :
 
 fi
 
+		ISC_PK11_C="pk11.c"
+		ISC_PK11_O="pk11.$O"
+		ISC_PK11_API_C="pk11_api.c"
+		ISC_PK11_API_O="pk11_api.$O"
+		ISC_ISCPK11_API_C="unix/pk11_api.c"
+		ISC_ISCPK11_API_O="unix/pk11_api.$O"
 		;;
 esac
 
 
 
 
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PKCS11 tools" >&5
 $as_echo_n "checking for PKCS11 tools... " >&6; }
 case "$use_pkcs11" in
@@ -16419,46 +16481,6 @@ esac
 
 
 
-
-# Check whether --with-libtool was given.
-if test "${with_libtool+set}" = set; then :
-  withval=$with_libtool; use_libtool="$withval"
-else
-  use_libtool="no"
-fi
-
-
-case $use_libtool in
-	yes)
-
-		O=lo
-		A=la
-		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
-		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
-		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
-		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
-		case "$host" in
-		*) LIBTOOL_ALLOW_UNDEFINED= ;;
-		esac
-		case "$host" in
-		*-ibm-aix*) LIBTOOL_IN_MAIN="-Wl,-bI:T_testlist.imp" ;;
-		*) LIBTOOL_IN_MAIN= ;;
-		esac;
-		;;
-	*)
-		O=o
-		A=a
-		LIBTOOL=
-
-		LIBTOOL_MKDEP_SED=
-		LIBTOOL_MODE_COMPILE=
-		LIBTOOL_MODE_INSTALL=
-		LIBTOOL_MODE_LINK=
-		LIBTOOL_ALLOW_UNDEFINED=
-		LIBTOOL_IN_MAIN=
-		;;
-esac
-
 #
 # enable/disable dumping stack backtrace.  Also check if the system supports
 # glibc-compatible backtrace() function.
@@ -19721,9 +19743,7 @@ BIND9_TOP_BUILDDIR=`pwd`
 
 
 
-
 if test "X$srcdir" != "X"; then
-	BIND9_ISCPK11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/iscpk11/include"
 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
 	BIND9_ISCCFG_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccfg/include"
@@ -19731,7 +19751,6 @@ if test "X$srcdir" != "X"; then
 	BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include"
 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
 else
-	BIND9_ISCPK11_BUILDINCLUDE=""
 	BIND9_ISC_BUILDINCLUDE=""
 	BIND9_ISCCC_BUILDINCLUDE=""
 	BIND9_ISCCFG_BUILDINCLUDE=""
@@ -19779,9 +19798,6 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}"
 
 
 
-LIBISCPK11_API="$srcdir/lib/iscpk11/api"
-
-
 LIBISC_API="$srcdir/lib/isc/api"
 
 
@@ -20786,7 +20802,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/iscpk11/Makefile lib/iscpk11/include/Makefile lib/iscpk11/include/iscpk11/Makefile lib/iscpk11/include/pkcs11/Makefile lib/iscpk11/unix/Makefile lib/iscpk11/unix/include/Makefile lib/iscpk11/unix/include/pkcs11/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -21883,24 +21899,20 @@ do
     "lib/isc/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/Makefile" ;;
     "lib/isc/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/isc/Makefile" ;;
     "lib/isc/include/isc/platform.h") CONFIG_FILES="$CONFIG_FILES lib/isc/include/isc/platform.h" ;;
+    "lib/isc/include/pk11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/pk11/Makefile" ;;
+    "lib/isc/include/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/pkcs11/Makefile" ;;
     "lib/isc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/tests/Makefile" ;;
     "lib/isc/nls/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/nls/Makefile" ;;
     "lib/isc/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/Makefile" ;;
     "lib/isc/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/Makefile" ;;
     "lib/isc/unix/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/isc/Makefile" ;;
+    "lib/isc/unix/include/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/pkcs11/Makefile" ;;
     "lib/isccc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/Makefile" ;;
     "lib/isccc/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/include/Makefile" ;;
     "lib/isccc/include/isccc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccc/include/isccc/Makefile" ;;
     "lib/isccfg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/Makefile" ;;
     "lib/isccfg/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/include/Makefile" ;;
     "lib/isccfg/include/isccfg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isccfg/include/isccfg/Makefile" ;;
-    "lib/iscpk11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/Makefile" ;;
-    "lib/iscpk11/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/include/Makefile" ;;
-    "lib/iscpk11/include/iscpk11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/include/iscpk11/Makefile" ;;
-    "lib/iscpk11/include/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/include/pkcs11/Makefile" ;;
-    "lib/iscpk11/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/unix/Makefile" ;;
-    "lib/iscpk11/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/unix/include/Makefile" ;;
-    "lib/iscpk11/unix/include/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iscpk11/unix/include/pkcs11/Makefile" ;;
     "lib/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/Makefile" ;;
     "lib/lwres/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/Makefile" ;;
     "lib/lwres/include/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/include/lwres/Makefile" ;;

configure.in

@@ -1102,6 +1102,41 @@ AC_SUBST(THREADOPTSRCS)
 ISC_THREAD_DIR=$thread_dir
 AC_SUBST(ISC_THREAD_DIR)
 
+AC_ARG_WITH(libtool,
+	    [  --with-libtool          use GNU libtool],
+	    use_libtool="$withval", use_libtool="no")
+
+case $use_libtool in
+	yes)
+		AM_PROG_LIBTOOL
+		O=lo
+		A=la
+		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
+		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
+		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+		case "$host" in
+		*) LIBTOOL_ALLOW_UNDEFINED= ;;
+		esac
+		case "$host" in
+		*-ibm-aix*) LIBTOOL_IN_MAIN="-Wl,-bI:T_testlist.imp" ;;
+		*) LIBTOOL_IN_MAIN= ;;
+		esac;
+		;;
+	*)
+		O=o
+		A=a
+		LIBTOOL=
+		AC_SUBST(LIBTOOL)
+		LIBTOOL_MKDEP_SED=
+		LIBTOOL_MODE_COMPILE=
+		LIBTOOL_MODE_INSTALL=
+		LIBTOOL_MODE_LINK=
+		LIBTOOL_ALLOW_UNDEFINED=
+		LIBTOOL_IN_MAIN=
+		;;
+esac
+
 #
 # was --enable-native-pkcs11 specified?
 #  (note it implies both --without-openssl and --with-pkcs11)
@@ -1522,9 +1557,15 @@ fi
 case "$use_pkcs11" in
 	no)
 		AC_MSG_RESULT(no)
-		USE_PKCS11=''
+		USE_PKCS11=""
-		PKCS11_TEST=''
+		PKCS11_TEST=""
-		PKCS11_TOOLS=''
+		PKCS11_TOOLS=""
+		ISC_PK11_C=""
+		ISC_PK11_O=""
+		ISC_PK11_API_C=""
+		ISC_PK11_API_O=""
+		ISC_ISCPK11_API_C=""
+		ISC_ISCPK11_API_O=""
 		;;
 	yes|*)
 		AC_MSG_RESULT(yes)
@@ -1575,11 +1616,23 @@ int main() {
 		USE_PKCS11='-DUSE_PKCS11'
 		PKCS11_TOOLS=pkcs11
 		AC_CHECK_FUNC(getpassphrase, AC_DEFINE(HAVE_GETPASSPHRASE),)
+		ISC_PK11_C="pk11.c"
+		ISC_PK11_O="pk11.$O"
+		ISC_PK11_API_C="pk11_api.c"
+		ISC_PK11_API_O="pk11_api.$O"
+		ISC_ISCPK11_API_C="unix/pk11_api.c"
+		ISC_ISCPK11_API_O="unix/pk11_api.$O"
 		;;
 esac
 AC_SUBST(USE_PKCS11)
 AC_SUBST(PKCS11_TOOLS)
 AC_SUBST(PKCS11_ENGINE)
+AC_SUBST(ISC_PK11_C)
+AC_SUBST(ISC_PK11_O)
+AC_SUBST(ISC_PK11_API_C)
+AC_SUBST(ISC_PK11_API_O)
+AC_SUBST(ISC_ISCPK11_API_C)
+AC_SUBST(ISC_ISCPK11_API_O)
 
 AC_MSG_CHECKING(for PKCS11 tools)
 case "$use_pkcs11" in
@@ -1954,41 +2007,6 @@ esac
 AC_SUBST(PURIFY)
 
 
-AC_ARG_WITH(libtool,
-	    [  --with-libtool          use GNU libtool],
-	    use_libtool="$withval", use_libtool="no")
-
-case $use_libtool in
-	yes)
-		AM_PROG_LIBTOOL
-		O=lo
-		A=la
-		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
-		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
-		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
-		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
-		case "$host" in
-		*) LIBTOOL_ALLOW_UNDEFINED= ;;
-		esac
-		case "$host" in
-		*-ibm-aix*) LIBTOOL_IN_MAIN="-Wl,-bI:T_testlist.imp" ;;
-		*) LIBTOOL_IN_MAIN= ;;
-		esac;
-		;;
-	*)
-		O=o
-		A=a
-		LIBTOOL=
-		AC_SUBST(LIBTOOL)
-		LIBTOOL_MKDEP_SED=
-		LIBTOOL_MODE_COMPILE=
-		LIBTOOL_MODE_INSTALL=
-		LIBTOOL_MODE_LINK=
-		LIBTOOL_ALLOW_UNDEFINED=
-		LIBTOOL_IN_MAIN=
-		;;
-esac
-
 #
 # enable/disable dumping stack backtrace.  Also check if the system supports
 # glibc-compatible backtrace() function.
@@ -3634,7 +3652,6 @@ AC_CHECK_FUNCS(setlocale)
 AC_SUBST(BIND9_TOP_BUILDDIR)
 BIND9_TOP_BUILDDIR=`pwd`
 
-AC_SUBST(BIND9_ISCPK11_BUILDINCLUDE)
 AC_SUBST(BIND9_ISC_BUILDINCLUDE)
 AC_SUBST(BIND9_ISCCC_BUILDINCLUDE)
 AC_SUBST(BIND9_ISCCFG_BUILDINCLUDE)
@@ -3642,7 +3659,6 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE)
 AC_SUBST(BIND9_LWRES_BUILDINCLUDE)
 AC_SUBST(BIND9_BIND9_BUILDINCLUDE)
 if test "X$srcdir" != "X"; then
-	BIND9_ISCPK11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/iscpk11/include"
 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
 	BIND9_ISCCFG_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccfg/include"
@@ -3650,7 +3666,6 @@ if test "X$srcdir" != "X"; then
 	BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include"
 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
 else
-	BIND9_ISCPK11_BUILDINCLUDE=""
 	BIND9_ISC_BUILDINCLUDE=""
 	BIND9_ISCCC_BUILDINCLUDE=""
 	BIND9_ISCCFG_BUILDINCLUDE=""
@@ -3697,9 +3712,6 @@ BIND9_CONFIGARGS="`echo $BIND9_CONFIGARGS | sed 's/^ //'`"
 BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}"
 AC_SUBST(BIND9_CONFIGARGS)
 
-AC_SUBST_FILE(LIBISCPK11_API)
-LIBISCPK11_API="$srcdir/lib/iscpk11/api"
-
 AC_SUBST_FILE(LIBISC_API)
 LIBISC_API="$srcdir/lib/isc/api"
 
@@ -4092,24 +4104,20 @@ AC_CONFIG_FILES([
 	lib/isc/include/Makefile
 	lib/isc/include/isc/Makefile
 	lib/isc/include/isc/platform.h
+	lib/isc/include/pk11/Makefile
+	lib/isc/include/pkcs11/Makefile
 	lib/isc/tests/Makefile
 	lib/isc/nls/Makefile
 	lib/isc/unix/Makefile
 	lib/isc/unix/include/Makefile
 	lib/isc/unix/include/isc/Makefile
+	lib/isc/unix/include/pkcs11/Makefile
 	lib/isccc/Makefile
 	lib/isccc/include/Makefile
 	lib/isccc/include/isccc/Makefile
 	lib/isccfg/Makefile
 	lib/isccfg/include/Makefile
 	lib/isccfg/include/isccfg/Makefile
-	lib/iscpk11/Makefile
-	lib/iscpk11/include/Makefile
-	lib/iscpk11/include/iscpk11/Makefile
-	lib/iscpk11/include/pkcs11/Makefile
-	lib/iscpk11/unix/Makefile
-	lib/iscpk11/unix/include/Makefile
-	lib/iscpk11/unix/include/pkcs11/Makefile
 	lib/lwres/Makefile
 	lib/lwres/include/Makefile
 	lib/lwres/include/lwres/Makefile

lib/Makefile.in

@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
-SUBDIRS =	iscpk11 isc isccc dns isccfg bind9 lwres irs tests samples
+SUBDIRS =	isc isccc dns isccfg bind9 lwres irs tests samples
 TARGETS =
 
 @BIND9_MAKE_RULES@

lib/dns/Makefile.in

@@ -35,7 +35,7 @@ top_srcdir =	@top_srcdir@
 USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 
 CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		${ISCPK11_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 
 CDEFINES =	-DUSE_MD5 @CRYPTO@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
@@ -45,10 +45,6 @@ ISCLIBS =	../../lib/isc/libisc.@A@
 
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 
-ISCPK11LIBS =	../../lib/iscpk11/libiscpk11.@A@
-
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
-
 LIBS =		@LIBS@
 
 # Alphabetically
@@ -152,7 +148,7 @@ libdns.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-		${OBJS} ${ISCLIBS} ${ISCPK11LIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
 
 timestamp: libdns.@A@
 	touch timestamp

lib/dns/dst_gost.h

@@ -29,9 +29,9 @@
 typedef EVP_MD_CTX isc_gost_t;
 #endif
 #ifdef HAVE_PKCS11_GOST
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_gost_t;
+typedef pk11_context_t isc_gost_t;
 #endif
 
 ISC_LANG_BEGINDECLS

lib/dns/dst_internal.h

@@ -119,7 +119,7 @@ struct dst_key {
 		DH *dh;
 		EVP_PKEY *pkey;
 #elif PKCS11CRYPTO
-		iscpk11_object_t *pkey;
+		pk11_object_t *pkey;
 #endif
 		dst_hmacmd5_key_t *hmacmd5;
 		dst_hmacsha1_key_t *hmacsha1;
@@ -167,7 +167,7 @@ struct dst_context {
 #ifdef OPENSSL
 		EVP_MD_CTX *evp_md_ctx;
 #elif PKCS11CRYPTO
-		iscpk11_context_t *pk11_ctx;
+		pk11_context_t *pk11_ctx;
 #endif
 	} ctxdata;
 };

lib/dns/pkcs11.c

@@ -21,8 +21,8 @@
 #include <dns/log.h>
 #include <dns/result.h>
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 
 #include "dst_pkcs11.h"
 

lib/dns/pkcs11dh_link.c

@@ -32,10 +32,10 @@
 #include "dst_parse.h"
 #include "dst_pkcs11.h"
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 #define WANT_DH_PRIMES
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
 
 #include <pkcs11/pkcs11.h>
 
@@ -98,7 +98,7 @@ pkcs11dh_loadpriv(const dst_key_t *key,
 		{ CKA_VALUE, NULL, 0 }
 	};
 	CK_ATTRIBUTE *attr;
-	const iscpk11_object_t *priv;
+	const pk11_object_t *priv;
 	isc_result_t ret;
 	unsigned int i;
 
@@ -179,7 +179,7 @@ pkcs11dh_computesecret(const dst_key_t *pub, const dst_key_t *priv,
 		{ CKA_VALUE, NULL, 0 }
 	};
 	CK_BYTE *secValue;
-	iscpk11_context_t ctx;
+	pk11_context_t ctx;
 	isc_result_t ret;
 	unsigned int i;
 	isc_region_t r;
@@ -261,7 +261,7 @@ pkcs11dh_computesecret(const dst_key_t *pub, const dst_key_t *priv,
 
 static isc_boolean_t
 pkcs11dh_compare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *dh1, *dh2;
+	pk11_object_t *dh1, *dh2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	dh1 = key1->keydata.pkey;
@@ -318,7 +318,7 @@ pkcs11dh_compare(const dst_key_t *key1, const dst_key_t *key2) {
 
 static isc_boolean_t
 pkcs11dh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *dh1, *dh2;
+	pk11_object_t *dh1, *dh2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	dh1 = key1->keydata.pkey;
@@ -395,14 +395,14 @@ pkcs11dh_generate(dst_key_t *key, int generator, void (*callback)(int)) {
 		{ CKA_DERIVE, &truevalue, (CK_ULONG) sizeof(truevalue) },
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *dh = NULL;
+	pk11_object_t *dh = NULL;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 
 	UNUSED(callback);
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_DH, ISC_FALSE, ISC_FALSE, NULL,
@@ -485,7 +485,7 @@ pkcs11dh_generate(dst_key_t *key, int generator, void (*callback)(int)) {
 		  &pub, &priv),
 		 DST_R_CRYPTOFAILURE);
 
-	dh = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
+	dh = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
 	if (dh == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(dh, 0,  sizeof(*dh));
@@ -586,7 +586,7 @@ pkcs11dh_generate(dst_key_t *key, int generator, void (*callback)(int)) {
 
 static isc_boolean_t
 pkcs11dh_isprivate(const dst_key_t *key) {
-	iscpk11_object_t *dh = key->keydata.pkey;
+	pk11_object_t *dh = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (dh == NULL)
@@ -597,7 +597,7 @@ pkcs11dh_isprivate(const dst_key_t *key) {
 
 static void
 pkcs11dh_destroy(dst_key_t *key) {
-	iscpk11_object_t *dh = key->keydata.pkey;
+	pk11_object_t *dh = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (dh == NULL)
@@ -650,7 +650,7 @@ uint16_fromregion(isc_region_t *region) {
 
 static isc_result_t
 pkcs11dh_todns(const dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *dh;
+	pk11_object_t *dh;
 	CK_ATTRIBUTE *attr;
 	isc_region_t r;
 	isc_uint16_t dnslen, plen = 0, glen = 0, publen = 0;
@@ -726,7 +726,7 @@ pkcs11dh_todns(const dst_key_t *key, isc_buffer_t *data) {
 
 static isc_result_t
 pkcs11dh_fromdns(dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *dh;
+	pk11_object_t *dh;
 	isc_region_t r;
 	isc_uint16_t plen, glen, plen_, glen_, publen;
 	CK_BYTE *prime = NULL, *base = NULL, *pub = NULL;
@@ -737,7 +737,7 @@ pkcs11dh_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (r.length == 0)
 		return (ISC_R_SUCCESS);
 
-	dh = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
+	dh = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
 	if (dh == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(dh, 0, sizeof(*dh));
@@ -915,7 +915,7 @@ pkcs11dh_fromdns(dst_key_t *key, isc_buffer_t *data) {
 static isc_result_t
 pkcs11dh_tofile(const dst_key_t *key, const char *directory) {
 	int i;
-	iscpk11_object_t *dh;
+	pk11_object_t *dh;
 	CK_ATTRIBUTE *attr;
 	CK_ATTRIBUTE *prime = NULL, *base = NULL, *pub = NULL, *prv = NULL;
 	dst_private_t priv;
@@ -1004,7 +1004,7 @@ pkcs11dh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	dst_private_t priv;
 	isc_result_t ret;
 	int i;
-	iscpk11_object_t *dh = NULL;
+	pk11_object_t *dh = NULL;
 	CK_ATTRIBUTE *attr;
 	isc_mem_t *mctx;
 
@@ -1019,7 +1019,7 @@ pkcs11dh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	if (key->external)
 		DST_RET(DST_R_EXTERNALKEY);
 
-	dh = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
+	dh = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dh));
 	if (dh == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(dh, 0, sizeof(*dh));

lib/dns/pkcs11dsa_link.c

@@ -33,7 +33,7 @@
 #include "dst_parse.h"
 #include "dst_pkcs11.h"
 
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 
 /*
  * FIPS 186-2 DSA keys:
@@ -95,13 +95,13 @@ pkcs11dsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) {
 		{ CKA_VALUE, NULL, 0 }
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
@@ -225,13 +225,13 @@ pkcs11dsa_createctx_verify(dst_key_t *key, dst_context_t *dctx) {
 		{ CKA_VALUE, NULL, 0 }
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
@@ -346,7 +346,7 @@ pkcs11dsa_createctx(dst_key_t *key, dst_context_t *dctx) {
 
 static void
 pkcs11dsa_destroyctx(dst_context_t *dctx) {
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 
 	if (pk11_ctx != NULL) {
 		if (!pk11_ctx->ontoken &&
@@ -363,7 +363,7 @@ pkcs11dsa_destroyctx(dst_context_t *dctx) {
 static isc_result_t
 pkcs11dsa_adddata(dst_context_t *dctx, const isc_region_t *data) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	if (dctx->use == DO_SIGN)
@@ -386,7 +386,7 @@ pkcs11dsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	CK_RV rv;
 	CK_ULONG siglen = ISC_SHA1_DIGESTLENGTH * 2;
 	isc_region_t r;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	isc_buffer_availableregion(sig, &r);
@@ -409,7 +409,7 @@ pkcs11dsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 static isc_result_t
 pkcs11dsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	PK11_CALL(pkcs_C_VerifyFinal,
@@ -422,7 +422,7 @@ pkcs11dsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 
 static isc_boolean_t
 pkcs11dsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *dsa1, *dsa2;
+	pk11_object_t *dsa1, *dsa2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	dsa1 = key1->keydata.pkey;
@@ -528,16 +528,16 @@ pkcs11dsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
 	UNUSED(unused);
 	UNUSED(callback);
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
@@ -550,7 +550,7 @@ pkcs11dsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 		 (pk11_ctx->session, &mech, dpTemplate, (CK_ULONG) 5, &dp),
 		 DST_R_CRYPTOFAILURE);
 
-	dsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
+	dsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
 	if (dsa == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(dsa, 0, sizeof(*dsa));
@@ -649,7 +649,7 @@ pkcs11dsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 
 static isc_boolean_t
 pkcs11dsa_isprivate(const dst_key_t *key) {
-	iscpk11_object_t *dsa = key->keydata.pkey;
+	pk11_object_t *dsa = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (dsa == NULL)
@@ -660,7 +660,7 @@ pkcs11dsa_isprivate(const dst_key_t *key) {
 
 static void
 pkcs11dsa_destroy(dst_key_t *key) {
-	iscpk11_object_t *dsa = key->keydata.pkey;
+	pk11_object_t *dsa = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (dsa == NULL)
@@ -699,7 +699,7 @@ pkcs11dsa_destroy(dst_key_t *key) {
 
 static isc_result_t
 pkcs11dsa_todns(const dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
 	CK_ATTRIBUTE *attr;
 	isc_region_t r;
 	int dnslen;
@@ -769,7 +769,7 @@ pkcs11dsa_todns(const dst_key_t *key, isc_buffer_t *data) {
 
 static isc_result_t
 pkcs11dsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
 	isc_region_t r;
 	unsigned int t, p_bytes;
 	CK_BYTE *prime, *subprime, *base, *pub_key;
@@ -779,7 +779,7 @@ pkcs11dsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (r.length == 0)
 		return (ISC_R_SUCCESS);
 
-	dsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
+	dsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
 	if (dsa == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(dsa, 0, sizeof(*dsa));
@@ -884,7 +884,7 @@ pkcs11dsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 static isc_result_t
 pkcs11dsa_tofile(const dst_key_t *key, const char *directory) {
 	int cnt = 0;
-	iscpk11_object_t *dsa;
+	pk11_object_t *dsa;
 	CK_ATTRIBUTE *attr;
 	CK_ATTRIBUTE *prime = NULL, *subprime = NULL, *base = NULL;
 	CK_ATTRIBUTE *pub_key = NULL, *priv_key = NULL;
@@ -964,7 +964,7 @@ pkcs11dsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	dst_private_t priv;
 	isc_result_t ret;
 	int i;
-	iscpk11_object_t *dsa = NULL;
+	pk11_object_t *dsa = NULL;
 	CK_ATTRIBUTE *attr;
 	isc_mem_t *mctx = key->mctx;
 
@@ -989,7 +989,7 @@ pkcs11dsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 		return (ISC_R_SUCCESS);
 	}
 
-	dsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
+	dsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*dsa));
 	if (dsa == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(dsa, 0, sizeof(*dsa));

lib/dns/pkcs11ecdsa_link.c

@@ -33,10 +33,10 @@
 #include "dst_parse.h"
 #include "dst_pkcs11.h"
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 #define WANT_ECC_CURVES
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
 
 #include <pkcs11/pkcs11.h>
 
@@ -79,8 +79,8 @@ pkcs11ecdsa_createctx(dst_key_t *key, dst_context_t *dctx) {
 	CK_RV rv;
 	CK_MECHANISM mech = {0, NULL, 0 };
 	CK_SLOT_ID slotid;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
-	iscpk11_object_t *ec = key->keydata.pkey;
+	pk11_object_t *ec = key->keydata.pkey;
 	isc_result_t ret;
 
 	UNUSED(key);
@@ -92,8 +92,8 @@ pkcs11ecdsa_createctx(dst_key_t *key, dst_context_t *dctx) {
 	else
 		mech.mechanism = CKM_SHA384;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(pk11_ctx, 0, sizeof(*pk11_ctx));
@@ -122,7 +122,7 @@ static void
 pkcs11ecdsa_destroyctx(dst_context_t *dctx) {
 	CK_BYTE garbage[ISC_SHA384_DIGESTLENGTH];
 	CK_ULONG len = ISC_SHA384_DIGESTLENGTH;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 
 	REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 ||
 		dctx->key->key_alg == DST_ALG_ECDSA384);
@@ -140,7 +140,7 @@ pkcs11ecdsa_destroyctx(dst_context_t *dctx) {
 static isc_result_t
 pkcs11ecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 ||
@@ -176,9 +176,9 @@ pkcs11ecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	CK_BYTE digest[ISC_SHA384_DIGESTLENGTH];
 	CK_ULONG dgstlen;
 	CK_ULONG siglen;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	dst_key_t *key = dctx->key;
-	iscpk11_object_t *ec = key->keydata.pkey;
+	pk11_object_t *ec = key->keydata.pkey;
 	isc_region_t r;
 	isc_result_t ret = ISC_R_SUCCESS;
 	unsigned int i;
@@ -297,9 +297,9 @@ pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 	CK_ATTRIBUTE *attr;
 	CK_BYTE digest[ISC_SHA384_DIGESTLENGTH];
 	CK_ULONG dgstlen;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	dst_key_t *key = dctx->key;
-	iscpk11_object_t *ec = key->keydata.pkey;
+	pk11_object_t *ec = key->keydata.pkey;
 	isc_result_t ret = ISC_R_SUCCESS;
 	unsigned int i;
 
@@ -381,7 +381,7 @@ pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 
 static isc_boolean_t
 pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *ec1, *ec2;
+	pk11_object_t *ec1, *ec2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	ec1 = key1->keydata.pkey;
@@ -482,8 +482,8 @@ pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) }
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 
 	REQUIRE(key->key_alg == DST_ALG_ECDSA256 ||
@@ -491,8 +491,8 @@ pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 	UNUSED(unused);
 	UNUSED(callback);
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE, ISC_FALSE, NULL,
@@ -500,7 +500,7 @@ pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 	if (ret != ISC_R_SUCCESS)
 		goto err;
 
-	ec = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
+	ec = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
 	if (ec == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(ec, 0, sizeof(*ec));
@@ -579,7 +579,7 @@ pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 
 static isc_boolean_t
 pkcs11ecdsa_isprivate(const dst_key_t *key) {
-	iscpk11_object_t *ec = key->keydata.pkey;
+	pk11_object_t *ec = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (ec == NULL)
@@ -590,7 +590,7 @@ pkcs11ecdsa_isprivate(const dst_key_t *key) {
 
 static void
 pkcs11ecdsa_destroy(dst_key_t *key) {
-	iscpk11_object_t *ec = key->keydata.pkey;
+	pk11_object_t *ec = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (ec == NULL)
@@ -623,7 +623,7 @@ pkcs11ecdsa_destroy(dst_key_t *key) {
 
 static isc_result_t
 pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
 	isc_region_t r;
 	unsigned int len;
 	CK_ATTRIBUTE *attr;
@@ -655,7 +655,7 @@ pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) {
 
 static isc_result_t
 pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
 	isc_region_t r;
 	unsigned int len;
 	CK_ATTRIBUTE *attr;
@@ -674,7 +674,7 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (r.length != len)
 		return (DST_R_INVALIDPUBLICKEY);
 
-	ec = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
+	ec = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
 	if (ec == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(ec, 0, sizeof(*ec));
@@ -742,7 +742,7 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 static isc_result_t
 pkcs11ecdsa_tofile(const dst_key_t *key, const char *directory) {
 	isc_result_t ret;
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
 	dst_private_t priv;
 	unsigned char *buf = NULL;
 	unsigned int i = 0;
@@ -810,9 +810,9 @@ pkcs11ecdsa_fetch(dst_key_t *key, const char *engine, const char *label,
 	CK_ULONG cnt;
 	CK_ATTRIBUTE *attr;
 	CK_ATTRIBUTE *pubattr;
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
-	iscpk11_object_t *pubec;
+	pk11_object_t *pubec;
-	iscpk11_context_t *pk11_ctx = NULL;
+	pk11_context_t *pk11_ctx = NULL;
 	isc_result_t ret;
 
 	if (label == NULL)
@@ -852,8 +852,8 @@ pkcs11ecdsa_fetch(dst_key_t *key, const char *engine, const char *label,
 	if (ret != ISC_R_SUCCESS)
 		goto err;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE,
@@ -910,7 +910,7 @@ static isc_result_t
 pkcs11ecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	dst_private_t priv;
 	isc_result_t ret;
-	iscpk11_object_t *ec = NULL;
+	pk11_object_t *ec = NULL;
 	CK_ATTRIBUTE *attr, *pattr;
 	isc_mem_t *mctx = key->mctx;
 	unsigned int i;
@@ -953,7 +953,7 @@ pkcs11ecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 			break;
 		}
 	}
-	ec = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
+	ec = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
 	if (ec == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(ec, 0, sizeof(*ec));
@@ -1032,14 +1032,14 @@ pkcs11ecdsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
 	};
 	CK_ULONG cnt;
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *ec;
+	pk11_object_t *ec;
-	iscpk11_context_t *pk11_ctx = NULL;
+	pk11_context_t *pk11_ctx = NULL;
 	isc_result_t ret;
 	unsigned int i;
 
 	UNUSED(pin);
 
-	ec = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
+	ec = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*ec));
 	if (ec == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(ec, 0, sizeof(*ec));
@@ -1061,8 +1061,8 @@ pkcs11ecdsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
 	if (ret != ISC_R_SUCCESS)
 		goto err;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE,

lib/dns/pkcs11gost_link.c

@@ -35,10 +35,10 @@
 #include "dst_pkcs11.h"
 #include "dst_gost.h"
 
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 #define WANT_GOST_PARAMS
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
 
 #include <pkcs11/pkcs11.h>
 
@@ -158,13 +158,13 @@ pkcs11gost_createctx_sign(dst_key_t *key, dst_context_t *dctx) {
 		  (CK_ULONG) sizeof(pk11_gost_paramset) }
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
@@ -259,13 +259,13 @@ pkcs11gost_createctx_verify(dst_key_t *key, dst_context_t *dctx) {
 		  (CK_ULONG) sizeof(pk11_gost_paramset) }
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
@@ -350,7 +350,7 @@ pkcs11gost_createctx(dst_key_t *key, dst_context_t *dctx) {
 
 static void
 pkcs11gost_destroyctx(dst_context_t *dctx) {
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 
 	if (pk11_ctx != NULL) {
 		if (!pk11_ctx->ontoken &&
@@ -367,7 +367,7 @@ pkcs11gost_destroyctx(dst_context_t *dctx) {
 static isc_result_t
 pkcs11gost_adddata(dst_context_t *dctx, const isc_region_t *data) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	if (dctx->use == DO_SIGN)
@@ -390,7 +390,7 @@ pkcs11gost_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	CK_RV rv;
 	CK_ULONG siglen = ISC_GOST_SIGNATURELENGTH;
 	isc_region_t r;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	isc_buffer_availableregion(sig, &r);
@@ -412,7 +412,7 @@ pkcs11gost_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 static isc_result_t
 pkcs11gost_verify(dst_context_t *dctx, const isc_region_t *sig) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	PK11_CALL(pkcs_C_VerifyFinal,
@@ -425,7 +425,7 @@ pkcs11gost_verify(dst_context_t *dctx, const isc_region_t *sig) {
 
 static isc_boolean_t
 pkcs11gost_compare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *gost1, *gost2;
+	pk11_object_t *gost1, *gost2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	gost1 = key1->keydata.pkey;
@@ -494,15 +494,15 @@ pkcs11gost_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 
 	UNUSED(unused);
 	UNUSED(callback);
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
@@ -517,7 +517,7 @@ pkcs11gost_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 		  &pub, &priv),
 		 DST_R_CRYPTOFAILURE);
 
-	gost = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
+	gost = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
 	if (gost == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(gost, 0, sizeof(*gost));
@@ -582,7 +582,7 @@ pkcs11gost_generate(dst_key_t *key, int unused, void (*callback)(int)) {
 
 static isc_boolean_t
 pkcs11gost_isprivate(const dst_key_t *key) {
-	iscpk11_object_t *gost = key->keydata.pkey;
+	pk11_object_t *gost = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (gost == NULL)
@@ -593,7 +593,7 @@ pkcs11gost_isprivate(const dst_key_t *key) {
 
 static void
 pkcs11gost_destroy(dst_key_t *key) {
-	iscpk11_object_t *gost = key->keydata.pkey;
+	pk11_object_t *gost = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (gost == NULL)
@@ -628,7 +628,7 @@ pkcs11gost_destroy(dst_key_t *key) {
 
 static isc_result_t
 pkcs11gost_todns(const dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
 	isc_region_t r;
 	CK_ATTRIBUTE *attr;
 
@@ -650,7 +650,7 @@ pkcs11gost_todns(const dst_key_t *key, isc_buffer_t *data) {
 
 static isc_result_t
 pkcs11gost_fromdns(dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
 	isc_region_t r;
 	CK_ATTRIBUTE *attr;
 
@@ -660,7 +660,7 @@ pkcs11gost_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (r.length != ISC_GOST_PUBKEYLENGTH)
 		return (DST_R_INVALIDPUBLICKEY);
 
-	gost = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
+	gost = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
 	if (gost == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(gost, 0, sizeof(*gost));
@@ -719,7 +719,7 @@ static unsigned char gost_private_der[39] = {
 static isc_result_t
 pkcs11gost_tofile(const dst_key_t *key, const char *directory) {
 	isc_result_t ret;
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
 	dst_private_t priv;
 	unsigned char *buf = NULL;
 	unsigned int i = 0;
@@ -771,7 +771,7 @@ pkcs11gost_tofile(const dst_key_t *key, const char *directory) {
 static isc_result_t
 pkcs11gost_tofile(const dst_key_t *key, const char *directory) {
 	isc_result_t ret;
-	iscpk11_object_t *gost;
+	pk11_object_t *gost;
 	dst_private_t priv;
 	unsigned char *buf = NULL;
 	unsigned int i = 0;
@@ -814,7 +814,7 @@ static isc_result_t
 pkcs11gost_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	dst_private_t priv;
 	isc_result_t ret;
-	iscpk11_object_t *gost = NULL;
+	pk11_object_t *gost = NULL;
 	CK_ATTRIBUTE *attr, *pattr;
 	isc_mem_t *mctx = key->mctx;
 
@@ -861,7 +861,7 @@ pkcs11gost_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 			32 + adj);
 	}
 
-	gost = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
+	gost = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*gost));
 	if (gost == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(gost, 0, sizeof(*gost));

lib/dns/pkcs11rsa_link.c

@@ -34,7 +34,7 @@
 #include "dst_parse.h"
 #include "dst_pkcs11.h"
 
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 
 /*
  * Limit the size of public exponents.
@@ -78,8 +78,8 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) {
 	};
 	CK_ATTRIBUTE *attr;
 	CK_SLOT_ID slotid;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
@@ -91,8 +91,8 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) {
 
 	rsa = key->keydata.pkey;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(pk11_ctx, 0, sizeof(*pk11_ctx));
@@ -278,8 +278,8 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
 		{ CKA_PUBLIC_EXPONENT, NULL, 0 },
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
@@ -291,8 +291,8 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
 
 	rsa = key->keydata.pkey;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,
@@ -411,13 +411,13 @@ pkcs11rsa_createctx2(dst_key_t *key, int maxbits, dst_context_t *dctx) {
 
 static void
 pkcs11rsa_destroyctx(dst_context_t *dctx) {
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 
 	if (pk11_ctx != NULL) {
 		if (!pk11_ctx->ontoken &&
 		    (pk11_ctx->object != CK_INVALID_HANDLE))
 			(void) pkcs_C_DestroyObject(pk11_ctx->session,
-					       pk11_ctx->object);
+						    pk11_ctx->object);
 		pk11_return_session(pk11_ctx);
 		memset(pk11_ctx, 0, sizeof(*pk11_ctx));
 		isc_mem_put(dctx->mctx, pk11_ctx, sizeof(*pk11_ctx));
@@ -428,7 +428,7 @@ pkcs11rsa_destroyctx(dst_context_t *dctx) {
 static isc_result_t
 pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	if (dctx->use == DO_SIGN)
@@ -451,7 +451,7 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	CK_RV rv;
 	CK_ULONG siglen = 0;
 	isc_region_t r;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	PK11_RET(pkcs_C_SignFinal,
@@ -476,7 +476,7 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 static isc_result_t
 pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 	CK_RV rv;
-	iscpk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
+	pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx;
 	isc_result_t ret = ISC_R_SUCCESS;
 
 	PK11_CALL(pkcs_C_VerifyFinal,
@@ -489,7 +489,7 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
 
 static isc_boolean_t
 pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
-	iscpk11_object_t *rsa1, *rsa2;
+	pk11_object_t *rsa1, *rsa2;
 	CK_ATTRIBUTE *attr1, *attr2;
 
 	rsa1 = key1->keydata.pkey;
@@ -567,15 +567,15 @@ pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
 		{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
 	};
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
-	iscpk11_context_t *pk11_ctx;
+	pk11_context_t *pk11_ctx;
 	isc_result_t ret;
 	unsigned int i;
 
 	UNUSED(callback);
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		return (ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE, ISC_FALSE, NULL,
@@ -607,7 +607,7 @@ pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
 		  &pub, &priv),
 		 DST_R_CRYPTOFAILURE);
 
-	rsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
+	rsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
 	if (rsa == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(rsa, 0, sizeof(*rsa));
@@ -678,7 +678,7 @@ pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
 
 static isc_boolean_t
 pkcs11rsa_isprivate(const dst_key_t *key) {
-	iscpk11_object_t *rsa = key->keydata.pkey;
+	pk11_object_t *rsa = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (rsa == NULL)
@@ -689,7 +689,7 @@ pkcs11rsa_isprivate(const dst_key_t *key) {
 
 static void
 pkcs11rsa_destroy(dst_key_t *key) {
-	iscpk11_object_t *rsa = key->keydata.pkey;
+	pk11_object_t *rsa = key->keydata.pkey;
 	CK_ATTRIBUTE *attr;
 
 	if (rsa == NULL)
@@ -732,7 +732,7 @@ pkcs11rsa_destroy(dst_key_t *key) {
 
 static isc_result_t
 pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
 	CK_ATTRIBUTE *attr;
 	isc_region_t r;
 	unsigned int e_bytes = 0, mod_bytes = 0;
@@ -786,7 +786,7 @@ pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) {
 
 static isc_result_t
 pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
 	isc_region_t r;
 	unsigned int e_bytes, mod_bytes;
 	CK_BYTE *exponent = NULL, *modulus = NULL;
@@ -796,7 +796,7 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (r.length == 0)
 		return (ISC_R_SUCCESS);
 
-	rsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
+	rsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
 	if (rsa == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(rsa, 0, sizeof(*rsa));
@@ -887,7 +887,7 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 static isc_result_t
 pkcs11rsa_tofile(const dst_key_t *key, const char *directory) {
 	int i;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
 	CK_ATTRIBUTE *attr;
 	CK_ATTRIBUTE *modulus = NULL, *exponent = NULL;
 	CK_ATTRIBUTE  *d = NULL, *p = NULL, *q = NULL;
@@ -1054,9 +1054,9 @@ pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label,
 	CK_ULONG cnt;
 	CK_ATTRIBUTE *attr;
 	CK_ATTRIBUTE *pubattr;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
-	iscpk11_object_t *pubrsa;
+	pk11_object_t *pubrsa;
-	iscpk11_context_t *pk11_ctx = NULL;
+	pk11_context_t *pk11_ctx = NULL;
 	isc_result_t ret;
 
 	if (label == NULL)
@@ -1096,8 +1096,8 @@ pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label,
 	if (ret != ISC_R_SUCCESS)
 		goto err;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,
@@ -1157,7 +1157,7 @@ pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label,
 }
 
 static isc_result_t
-rsa_check(iscpk11_object_t *rsa, iscpk11_object_t *pubrsa) {
+rsa_check(pk11_object_t *rsa, pk11_object_t *pubrsa) {
 	CK_ATTRIBUTE *pubattr, *privattr;
 	CK_BYTE *priv_exp = NULL, *priv_mod = NULL;
 	CK_BYTE *pub_exp = NULL, *pub_mod = NULL;
@@ -1224,7 +1224,7 @@ pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 	dst_private_t priv;
 	isc_result_t ret;
 	int i;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
 	CK_ATTRIBUTE *attr;
 	isc_mem_t *mctx = key->mctx;
 	const char *engine = NULL, *label = NULL;
@@ -1262,7 +1262,7 @@ pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 			break;
 		}
 	}
-	rsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
+	rsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
 	if (rsa == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(rsa, 0, sizeof(*rsa));
@@ -1407,14 +1407,14 @@ pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
 	};
 	CK_ULONG cnt;
 	CK_ATTRIBUTE *attr;
-	iscpk11_object_t *rsa;
+	pk11_object_t *rsa;
-	iscpk11_context_t *pk11_ctx = NULL;
+	pk11_context_t *pk11_ctx = NULL;
 	isc_result_t ret;
 	unsigned int i;
 
 	UNUSED(pin);
 
-	rsa = (iscpk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
+	rsa = (pk11_object_t *) isc_mem_get(key->mctx, sizeof(*rsa));
 	if (rsa == NULL)
 		return (ISC_R_NOMEMORY);
 	memset(rsa, 0, sizeof(*rsa));
@@ -1436,8 +1436,8 @@ pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
 	if (ret != ISC_R_SUCCESS)
 		goto err;
 
-	pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
+	pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
-						     sizeof(*pk11_ctx));
+						  sizeof(*pk11_ctx));
 	if (pk11_ctx == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,

lib/dns/tests/Makefile.in

@@ -27,15 +27,13 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		${ISCPK11_INCLUDES} @DST_OPENSSL_INC@
+		@DST_OPENSSL_INC@
 CDEFINES =	@CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =	../../isc/libisc.@A@
 ISCDEPLIBS =	../../isc/libisc.@A@
 DNSLIBS =	../libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =	../libdns.@A@
-ISCPK11LIBS =	../../iscpk11/libiscpk11.@A@
-ISCPK11DEPLIBS = ../../iscpk11/libiscpk11.@A@
 
 LIBS =		@LIBS@ @ATFLIBS@
 
@@ -81,8 +79,7 @@ TARGETS =	db_test@EXEEXT@ \
 
 @BIND9_MAKE_RULES@
 
-master_test@EXEEXT@: master_test.@O@ dnstest.@O@ \
+master_test@EXEEXT@: master_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	test -d testdata || mkdir testdata
 	test -d testdata/master || mkdir testdata/master
 	${PERL} ${srcdir}/mkraw.pl < ${srcdir}/testdata/master/master12.data.in \
@@ -93,101 +90,93 @@ master_test@EXEEXT@: master_test.@O@ dnstest.@O@ \
 		> testdata/master/master14.data
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			master_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-time_test@EXEEXT@: time_test.@O@ dnstest.@O@ \
+time_test@EXEEXT@: time_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			time_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-private_test@EXEEXT@: private_test.@O@ dnstest.@O@ \
+private_test@EXEEXT@: private_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			private_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-update_test@EXEEXT@: update_test.@O@ dnstest.@O@ \
+update_test@EXEEXT@: update_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			update_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-zonemgr_test@EXEEXT@: zonemgr_test.@O@ dnstest.@O@ \
+zonemgr_test@EXEEXT@: zonemgr_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			zonemgr_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-dbiterator_test@EXEEXT@: dbiterator_test.@O@ dnstest.@O@ \
+dbiterator_test@EXEEXT@: dbiterator_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			dbiterator_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-dbdiff_test@EXEEXT@: dbdiff_test.@O@ dnstest.@O@ \
+dbdiff_test@EXEEXT@: dbdiff_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			dbdiff_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-dbversion_test@EXEEXT@: dbversion_test.@O@ dnstest.@O@ \
+dbversion_test@EXEEXT@: dbversion_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			dbversion_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 zt_test@EXEEXT@: zt_test.@O@ dnstest.@O@ \
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+		${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			zt_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
-nsec3_test@EXEEXT@: nsec3_test.@O@ dnstest.@O@ \
+nsec3_test@EXEEXT@: nsec3_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-		${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			nsec3_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 rdataset_test@EXEEXT@: rdataset_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			rdataset_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 dispatch_test@EXEEXT@: dispatch_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			dispatch_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 rdatasetstats_test@EXEEXT@: rdatasetstats_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			rdatasetstats_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 rbt_test@EXEEXT@: rbt_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			rbt_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+				${ISCLIBS} ${LIBS}
 
 rdata_test@EXEEXT@: rdata_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			rdata_test.@O@ ${DNSLIBS} \
-			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+			${ISCLIBS} ${LIBS}
 
 geoip_test@EXEEXT@: geoip_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			geoip_test.@O@ dnstest.@O@ ${DNSLIBS} \
-			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+			${ISCLIBS} ${LIBS}
 
 db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			db_test.@O@ ${DNSLIBS} \
-			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+			${ISCLIBS} ${LIBS}
 
 gost_test@EXEEXT@: gost_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			gost_test.@O@ dnstest.@O@ ${DNSLIBS} \
-			${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+			${ISCLIBS} ${LIBS}
 
 unit::
 	sh ${top_srcdir}/unit/unittest.sh

lib/dns/tests/gost_test.c

@@ -40,9 +40,9 @@
 
 #ifdef HAVE_PKCS11_GOST
 #include "../dst_gost.h"
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
 #define WANT_GOST_PARAMS
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
 #include <pkcs11/pkcs11.h>
 #endif
 
@@ -330,7 +330,7 @@ ATF_TC_BODY(isc_gost_private, tc) {
 	CK_MECHANISM mech = { CKM_GOSTR3410_WITH_GOSTR3411, NULL, 0 };
 	CK_BYTE sig[64];
 	CK_ULONG siglen;
-	iscpk11_context_t pk11_ctx;
+	pk11_context_t pk11_ctx;
 
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE(result == ISC_R_SUCCESS);

lib/dns/tkey.c

@@ -50,7 +50,7 @@
 #define TKEY_RANDOM_AMOUNT 16
 
 #ifdef PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #endif
 
 #define RETERR(x) do { \

lib/dns/win32/libdns.dsp.in

@@ -43,11 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" @COPTY@ /FD /c
-@IF PKCS11
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" @COPTY@ /FD /c
-@ELSE PKCS11
 # ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" @COPTY@ /FD /c
-@END PKCS11
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -58,11 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
-@IF PKCS11
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../iscpk11/win32/Release/libiscpk11.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll @MACHINE@ /out:"../../../Build/Release/libdns.dll"
-@ELSE PKCS11
 # ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll @MACHINE@ /out:"../../../Build/Release/libdns.dll"
-@END PKCS11
 
 !ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
@@ -78,11 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" @COPTY@ /FD /GZ /c
-@IF PKCS11
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR @COPTY@ /FD /GZ /c
-@ELSE PKCS11
 # ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR @COPTY@ /FD /GZ /c
-@END PKCS11
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -93,11 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
-@IF PKCS11
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../iscpk11/win32/Debug/libiscpk11.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
-@ELSE PKCS11
 # ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
-@END PKCS11
 
 !ENDIF 
 

lib/dns/win32/libdns.mak.in

@@ -230,11 +230,7 @@ CLEAN :
 
 LIBXML=@LIBXML2_LIB@
 CPP=cl.exe
-@IF PKCS11
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@ELSE PKCS11
 CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@END PKCS11
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -274,11 +270,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-@IF PKCS11
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/Release/libisc.lib ../../iscpk11/win32/Release/libiscpk11.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
-@ELSE PKCS11
 LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/Release/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
-@END PKCS11
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
@@ -625,11 +617,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-@IF PKCS11
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@ELSE PKCS11
 CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@END PKCS11
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -775,11 +763,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-@IF PKCS11
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/Debug/libisc.lib ../../iscpk11/win32/Debug/libiscpk11.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ @GEOIP_LIB@ /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
-@ELSE PKCS11
 LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/Debug/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ @GEOIP_LIB@ /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
-@END PKCS11
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
@@ -1125,11 +1109,7 @@ SOURCE=..\dispatch.c
 
 !IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
-@IF PKCS11
-CPP_SWITCHES=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@ELSE PKCS11
 CPP_SWITCHES=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-@END PKCS11
 
 "$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1139,11 +1119,7 @@ CPP_SWITCHES=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "incl
 
 !ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
-@IF PKCS11
-CPP_SWITCHES=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@ELSE PKCS11
 CPP_SWITCHES=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-@END PKCS11
 
 "$(INTDIR)\dispatch.obj"	"$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<

lib/dns/win32/libdns.vcxproj.in

@@ -54,11 +54,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@IF PKCS11
-      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@ELSE PKCS11
       <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@END PKCS11
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
@@ -70,13 +66,8 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-@IF PKCS11
-      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-@ELSE PKCS11
       <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-@END PKCS11
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
       <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
     </Link>
@@ -90,11 +81,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
       <PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@IF PKCS11
-      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@ELSE PKCS11
       <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@END PKCS11
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
       <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -109,13 +96,8 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-@IF PKCS11
-      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libiscpk11.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-@ELSE PKCS11
       <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-@END PKCS11
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
       <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

lib/isc/Makefile.in

@@ -25,16 +25,18 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
+PROVIDER =	@PKCS11_PROVIDER@
+
 CINCLUDES =	-I${srcdir}/unix/include \
 		-I${srcdir}/@ISC_THREAD_DIR@/include \
 		-I${srcdir}/@ISC_ARCH_DIR@/include \
 		-I./include \
-		-I${srcdir}/include ${ISCPK11_INCLUDES} @ISC_OPENSSL_INC@
+		-I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES}
-CDEFINES =	@CRYPTO@
+CDEFINES =	@CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
 CWARNINGS =
 
 # Alphabetically
-UNIXOBJS =	@ISC_ISCIPV6_O@ \
+UNIXOBJS =	@ISC_ISCIPV6_O@ @ISC_ISCPK11_API_O@ \
 		unix/app.@O@ unix/dir.@O@ unix/entropy.@O@ \
 		unix/errno2result.@O@ unix/file.@O@ unix/fsaccess.@O@ \
 		unix/interfaceiter.@O@ unix/keyboard.@O@ unix/net.@O@ \
@@ -52,7 +54,7 @@ WIN32OBJS = 	win32/condition.@O@ win32/dir.@O@ win32/file.@O@ \
 		win32/thread.@O@ win32/time.@O@
 
 # Alphabetically
-OBJS =		@ISC_EXTRA_OBJS@ \
+OBJS =		@ISC_EXTRA_OBJS@ @ISC_PK11_O@ \
 		assertions.@O@ backtrace.@O@ base32.@O@ base64.@O@ \
 		bind9.@O@ buffer.@O@ bufferlist.@O@ \
 		commandline.@O@ crc64.@O@ error.@O@ event.@O@ \
@@ -71,7 +73,7 @@ OBJS =		@ISC_EXTRA_OBJS@ \
 SYMTBLOBJS =	backtrace-emptytbl.@O@
 
 # Alphabetically
-SRCS =		@ISC_EXTRA_SRCS@ \
+SRCS =		@ISC_EXTRA_SRCS@ @ISC_PK11_C@ \
 		assertions.c backtrace.c base32.c base64.c bind9.c \
 		buffer.c bufferlist.c commandline.c crc64.c \
 		error.c event.c heap.c hex.c hmacmd5.c hmacsha.c \

lib/isc/entropy.c

@@ -47,7 +47,7 @@
 #include <isc/util.h>
 
 #ifdef PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #endif
 
 #define ENTROPY_MAGIC		ISC_MAGIC('E', 'n', 't', 'e')

lib/isc/hmacmd5.c

@@ -34,8 +34,8 @@
 #include <isc/util.h>
 
 #if PKCS11CRYPTO || PKCS11CRYPTOWITHHMAC
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #endif
 
 #ifdef ISC_PLATFORM_OPENSSLHASH

lib/isc/hmacsha.c

@@ -35,8 +35,8 @@
 #include <isc/util.h>
 
 #if PKCS11CRYPTO
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #endif
 
 #ifdef ISC_PLATFORM_OPENSSLHASH

lib/isc/include/Makefile.in

@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-SUBDIRS =	isc
+SUBDIRS =	isc pk11 pkcs11
 TARGETS =
 
 @BIND9_MAKE_RULES@

lib/isc/include/isc/hmacmd5.h

@@ -38,9 +38,9 @@
 typedef HMAC_CTX isc_hmacmd5_t;
 
 #elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_hmacmd5_t;
+typedef pk11_context_t isc_hmacmd5_t;
 
 #else
 

lib/isc/include/isc/hmacsha.h

@@ -46,13 +46,13 @@ typedef HMAC_CTX isc_hmacsha384_t;
 typedef HMAC_CTX isc_hmacsha512_t;
 
 #elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_hmacsha1_t;
+typedef pk11_context_t isc_hmacsha1_t;
-typedef iscpk11_context_t isc_hmacsha224_t;
+typedef pk11_context_t isc_hmacsha224_t;
-typedef iscpk11_context_t isc_hmacsha256_t;
+typedef pk11_context_t isc_hmacsha256_t;
-typedef iscpk11_context_t isc_hmacsha384_t;
+typedef pk11_context_t isc_hmacsha384_t;
-typedef iscpk11_context_t isc_hmacsha512_t;
+typedef pk11_context_t isc_hmacsha512_t;
 
 #else
 

lib/isc/include/isc/md5.h

@@ -56,9 +56,9 @@
 typedef EVP_MD_CTX isc_md5_t;
 
 #elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_md5_t;
+typedef pk11_context_t isc_md5_t;
 
 #else
 

lib/isc/include/isc/platform.h.in

@@ -332,7 +332,6 @@
 #define LIBDNS_EXTERNAL_DATA
 #define LIBISCCC_EXTERNAL_DATA
 #define LIBISCCFG_EXTERNAL_DATA
-#define LIBISCPK11_EXTERNAL_DATA
 #define LIBBIND9_EXTERNAL_DATA
 #define LIBTESTS_EXTERNAL_DATA
 #else /*! \brief ISC_PLATFORM_USEDECLSPEC */
@@ -356,11 +355,6 @@
 #else
 #define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport)
 #endif
-#ifdef LIBISCPK11_EXPORTS
-#define LIBISCPK11_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBISCPK11_EXTERNAL_DATA __declspec(dllimport)
-#endif
 #ifdef LIBBIND9_EXPORTS
 #define LIBBIND9_EXTERNAL_DATA __declspec(dllexport)
 #else

lib/isc/include/isc/sha1.h

@@ -41,9 +41,9 @@
 typedef EVP_MD_CTX isc_sha1_t;
 
 #elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_sha1_t;
+typedef pk11_context_t isc_sha1_t;
 
 #else
 

lib/isc/include/isc/sha2.h

@@ -85,10 +85,10 @@ typedef EVP_MD_CTX isc_sha256_t;
 typedef EVP_MD_CTX isc_sha512_t;
 
 #elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 
-typedef iscpk11_context_t isc_sha256_t;
+typedef pk11_context_t isc_sha256_t;
-typedef iscpk11_context_t isc_sha512_t;
+typedef pk11_context_t isc_sha512_t;
 
 #else
 

lib/isc/include/pk11/Makefile.in

@@ -12,8 +12,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
@@ -25,16 +23,16 @@ top_srcdir =	@top_srcdir@
 # machine generated.  The latter are handled specially in the
 # install target below.
 #
-HEADERS =	pk11.h internal.h version.h
+HEADERS =	constants.h internal.h pk11.h
 SUBDIRS =
 TARGETS =
 
 @BIND9_MAKE_RULES@
 
 installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/iscpk11
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/pk11
 
 install:: installdirs
 	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/iscpk11 ; \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/pk11 ; \
 	done

lib/isc/include/pk11/constants.h

@@ -16,10 +16,10 @@
 
 /* $Id$ */
 
-#ifndef ISCPK11_CONSTANTS_H
+#ifndef PK11_CONSTANTS_H
-#define ISCPK11_CONSTANTS_H 1
+#define PK11_CONSTANTS_H 1
 
-/*! \file iscpk11/constants.h */
+/*! \file pk11/constants.h */
 
 /*%
  * Static arrays of data used for key template initalization
@@ -104,4 +104,4 @@ static CK_BYTE pk11_gost_paramset[] = {
 };
 #endif
 
-#endif /* ISCPK11_CONSTANTS_H */
+#endif /* PK11_CONSTANTS_H */

lib/isc/include/pk11/internal.h

@@ -16,10 +16,10 @@
 
 /* $Id$ */
 
-#ifndef ISCPK11_INTERNAL_H
+#ifndef PK11_INTERNAL_H
-#define ISCPK11_INTERNAL_H 1
+#define PK11_INTERNAL_H 1
 
-/*! \file iscpk11/internal.h */
+/*! \file pk11/internal.h */
 
 ISC_LANG_BEGINDECLS
 
@@ -29,18 +29,18 @@ void *pk11_mem_get(size_t size);
 
 void pk11_mem_put(void *ptr, size_t size);
 
-CK_SLOT_ID pk11_get_best_token(iscpk11_optype_t optype);
+CK_SLOT_ID pk11_get_best_token(pk11_optype_t optype);
 
 unsigned int pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt);
 
-CK_ATTRIBUTE *pk11_attribute_first(const iscpk11_object_t *obj);
+CK_ATTRIBUTE *pk11_attribute_first(const pk11_object_t *obj);
 
-CK_ATTRIBUTE *pk11_attribute_next(const iscpk11_object_t *obj,
+CK_ATTRIBUTE *pk11_attribute_next(const pk11_object_t *obj,
 				  CK_ATTRIBUTE *attr);
 
-CK_ATTRIBUTE *pk11_attribute_bytype(const iscpk11_object_t *obj,
+CK_ATTRIBUTE *pk11_attribute_bytype(const pk11_object_t *obj,
 				    CK_ATTRIBUTE_TYPE type);
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISCPK11_INTERNAL_H */
+#endif /* PK11_INTERNAL_H */

lib/isc/include/pk11/pk11.h

@@ -14,10 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef ISCPK11_PK11_H
+#ifndef PK11_PK11_H
-#define ISCPK11_PK11_H 1
+#define PK11_PK11_H 1
 
-/*! \file iscpk11/pk11.h */
+/*! \file pk11/pk11.h */
 
 #include <isc/lang.h>
 #include <isc/magic.h>
@@ -37,9 +37,9 @@ ISC_LANG_BEGINDECLS
 #define VALID_SES(x)	ISC_MAGIC_VALID(x, SES_MAGIC)
 #define VALID_TOK(x)	ISC_MAGIC_VALID(x, TOK_MAGIC)
 
-typedef struct iscpk11_context iscpk11_context_t;
+typedef struct pk11_context pk11_context_t;
 
-struct iscpk11_object {
+struct pk11_object {
 	CK_OBJECT_HANDLE	object;
 	CK_SLOT_ID		slot;
 	CK_BBOOL		ontoken;
@@ -48,7 +48,7 @@ struct iscpk11_object {
 	CK_ATTRIBUTE		*repr;
 };
 
-struct iscpk11_context {
+struct pk11_context {
 	void			*handle;
 	CK_SESSION_HANDLE	session;
 	CK_BBOOL		ontoken;
@@ -58,7 +58,7 @@ struct iscpk11_context {
 #endif
 };
 
-typedef struct iscpk11_object iscpk11_object_t;
+typedef struct pk11_object pk11_object_t;
 
 typedef enum {
 	OP_ANY = 0,
@@ -70,7 +70,7 @@ typedef enum {
 	OP_EC = 6,
 	OP_GOST = 7,
 	OP_MAX = 8
-} iscpk11_optype_t;
+} pk11_optype_t;
 
 /*%
  * Function prototypes
@@ -81,8 +81,8 @@ void pk11_set_lib_name(const char *lib_name);
  * Set the PKCS#11 provider (aka library) path/name.
  */
 
-isc_result_t pk11_get_session(iscpk11_context_t *ctx,
+isc_result_t pk11_get_session(pk11_context_t *ctx,
-			      iscpk11_optype_t optype,
+			      pk11_optype_t optype,
 			      isc_boolean_t rw,
 			      isc_boolean_t logon,
 			      const char *pin,
@@ -98,7 +98,7 @@ isc_result_t pk11_get_session(iscpk11_context_t *ctx,
  * slot:  device slot ID
  */
 
-void pk11_return_session(iscpk11_context_t *ctx);
+void pk11_return_session(pk11_context_t *ctx);
 /*%<
  * Release an active PKCS#11 session for reuse.
  */
@@ -112,8 +112,8 @@ isc_result_t pk11_rand_bytes(unsigned char *buf, int num);
 
 void pk11_rand_seed_fromfile(const char *randomfile);
 
-isc_result_t pk11_parse_uri(iscpk11_object_t *obj, const char *label,
+isc_result_t pk11_parse_uri(pk11_object_t *obj, const char *label,
-			    isc_mem_t *mctx, iscpk11_optype_t optype);
+			    isc_mem_t *mctx, pk11_optype_t optype);
 
 ISC_PLATFORM_NORETURN_PRE void
 pk11_error_fatalcheck(const char *file, int line,
@@ -258,4 +258,4 @@ pkcs_C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR RandomData,
 
 ISC_LANG_ENDDECLS
 
-#endif /* ISCPK11_PK11_H */
+#endif /* PK11_PK11_H */