+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
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
- ${ISC_INCLUDES} ${ISCPK11_INCLUDES}
+ ${ISC_INCLUDES}
CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
CWARNINGS =
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@
-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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
export BASEOBJS="named-checkzone.@O@ check-tool.@O@"; \
- export LIBS0="${ISCCFGLIBS} ${DNSLIBS} ${ISCPK11LIBS}"; \
+ export LIBS0="${ISCCFGLIBS} ${DNSLIBS}"; \
${FINALBUILDCMD}
doc man:: ${MANOBJS}
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
- ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- ${ISCPK11_INCLUDES}
+ ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
CDEFINES =
CWARNINGS =
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} \
- ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
-RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} \
- ${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+RNDCLIBS = ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
+RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
-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
READLINE_LIB = @READLINE_LIB@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- ${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES} \
- ${ISCPK11_INCLUDES}
+ ${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
CDEFINES = -DVERSION=\"${VERSION}\"
CWARNINGS =
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@
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}
@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@\"
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@ \
isc_result_t result;
const char *orig = str;
char *endp;
- int n;
+ size_t n;
if (isnone(str)) {
if (setp != NULL)
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@
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@
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} \
- ${ISCPK11DEPLIBS}
+ ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
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
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.
# 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
# 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"
"$(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= \
"$(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= \
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
<BrowseInformation>true</BrowseInformation>\r
-@IF PKCS11\r
- <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>\r
-@ELSE PKCS11\r
<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>\r
-@END PKCS11\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
-@IF PKCS11\r
- <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>\r
-@ELSE PKCS11\r
<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>\r
-@END PKCS11\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
DST_GSSAPI_INC = @DST_GSSAPI_INC@
CINCLUDES = ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- ${ISC_INCLUDES} ${ISCCFG_INCLUDES} ${ISCPK11_INCLUDES} \
- ${DST_GSSAPI_INC}
+ ${ISC_INCLUDES} ${ISCCFG_INCLUDES} ${DST_GSSAPI_INC}
CDEFINES = @USE_GSSAPI@
CWARNINGS =
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} \
- ${ISCPK11DEPLIBS}
+DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
-LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
- ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
- ${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
SUBDIRS =
@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
#include <isc/result.h>
#include <isc/types.h>
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
#ifdef WIN32
#define sleep(x) Sleep(x)
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;
#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)
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;
#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)
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;
#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);
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
-# 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\r
+# 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\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
# ADD RSC /l 0x409 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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@\r
-# 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"\r
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe"\r
\r
!ELSEIF "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"\r
\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
-# 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\r
+# 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\r
# SUBTRACT CPP /X @COPTY@\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /d "_DEBUG"\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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\r
+# 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\r
\r
!ENDIF \r
\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
BSC32_SBRS= \\r
\r
LINK32=link.exe\r
-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" \r
+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" \r
LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"\r
\r
"..\..\..\Build\Release\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
<<\r
\r
LINK32=link.exe\r
-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 \r
+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 \r
LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"\r
\r
"..\..\..\Build\Debug\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
<BrowseInformation>true</BrowseInformation>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
-# 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\r
+# 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\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
# ADD RSC /l 0x409 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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@\r
-# 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"\r
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe"\r
\r
!ELSEIF "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"\r
\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
-# 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\r
+# 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\r
# SUBTRACT CPP /X @COPTY@\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /d "_DEBUG"\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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\r
+# 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\r
\r
!ENDIF \r
\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
BSC32_SBRS= \\r
\r
LINK32=link.exe\r
-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" \r
+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" \r
LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"\r
\r
"..\..\..\Build\Release\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
<<\r
\r
LINK32=link.exe\r
-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 \r
+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 \r
LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"\r
\r
"..\..\..\Build\Debug\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
<BrowseInformation>true</BrowseInformation>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
-# 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\r
+# 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\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
# ADD RSC /l 0x409 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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@\r
-# 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"\r
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe"\r
\r
!ELSEIF "$(CFG)" == "pk11list - @PLATFORM@ Debug"\r
\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
-# 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\r
+# 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\r
# SUBTRACT CPP /X @COPTY@\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /d "_DEBUG"\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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\r
+# 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\r
\r
!ENDIF \r
\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
BSC32_SBRS= \\r
\r
LINK32=link.exe\r
-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" \r
+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" \r
LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"\r
\r
"..\..\..\Build\Release\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
<<\r
\r
LINK32=link.exe\r
-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 \r
+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 \r
LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"\r
\r
"..\..\..\Build\Debug\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
<BrowseInformation>true</BrowseInformation>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
-# 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\r
+# 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\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
# ADD RSC /l 0x409 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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@\r
-# 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"\r
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-tokens.exe"\r
\r
!ELSEIF "$(CFG)" == "pk11tokens - @PLATFORM@ Debug"\r
\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
-# 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\r
+# 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\r
# SUBTRACT CPP /X @COPTY@\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /d "_DEBUG"\r
# ADD BSC32 /nologo\r
LINK32=link.exe\r
# 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\r
-# 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\r
+# 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\r
\r
!ENDIF \r
\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
BSC32_SBRS= \\r
\r
LINK32=link.exe\r
-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" \r
+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" \r
LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj"\r
\r
"..\..\..\Build\Release\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
\r
CPP=cl.exe\r
-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 \r
+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 \r
\r
.c{$(INTDIR)}.obj::\r
$(CPP) @<<\r
<<\r
\r
LINK32=link.exe\r
-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 \r
+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 \r
LINK32_OBJS= "$(INTDIR)\pkcs11-tokens.obj"\r
\r
"..\..\..\Build\Debug\pkcs11-tokens.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
<BrowseInformation>true</BrowseInformation>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\iscpk11\include;..\..\..\lib\iscpk11\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
</ClCompile>\r
<Link>\r
<SubSystem>Console</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
- <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
- ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
- ${ISCPK11_INCLUDES}
+ ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
CDEFINES =
CWARNINGS =
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@
-NOSYMLIBS = ${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS = ${ISCLIBS} @LIBS@
+NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
-RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} \
- ${DNSDEPLIBS} ${ISCDEPLIBS} ${ISCPK11DEPLIBS}
+RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
- ${LWRES_INCLUDES} ${ISCPK11_INCLUDES} ${OMAPI_INCLUDES}
+ ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
CDEFINES =
CWARNINGS =
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@
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
-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
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@
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
- ${ISCPK11_INCLUDES}
+CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
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@
@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@
@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@
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
- ${ISCPK11_INCLUDES}
+CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
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@
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@
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
- ${ISCPK11_INCLUDES}
+CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
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@
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@
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
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 =
#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)
{ 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;
#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)
};
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;
#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)
{ 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;
#include <isc/result.h>
#include <isc/types.h>
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
#define getpassphrase(x) getpass(x)
#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)
{ 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;
#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)
{ 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;
#include <isc/result.h>
#include <isc/types.h>
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
#ifndef HAVE_CLOCK_GETTIME
#ifndef CLOCK_REALTIME
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;
#include <isc/result.h>
#include <isc/types.h>
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#ifndef HAVE_CLOCK_GETTIME
#ifndef CLOCK_REALTIME
#include <isc/result.h>
#include <isc/types.h>
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
#ifndef HAVE_CLOCK_GETTIME
#ifndef CLOCK_REALTIME
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;
#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)
{ 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;
#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)
{ 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;
#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)
{ 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;
#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)
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;
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
- ${ISCPK11_INCLUDES}
+CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
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@
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
- ${ISCPK11_INCLUDES}
+CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
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@
@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@
@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@
@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@
@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@
@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@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
- ${LWRES_INCLUDES} ${ISCPK_11INCLUDES} ${OMAPI_INCLUDES}
+ ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
CDEFINES =
CWARNINGS =
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@
-NOSYMLIBS = ${ISCNOSYMLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS = ${ISCLIBS} @LIBS@
+NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
SUBDIRS =
@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} \
- ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+named-journalprint@EXEEXT@: named-journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
export BASEOBJS="named-journalprint.@O@"; \
export LIBS0="${DNSLIBS}"; \
${FINALBUILDCMD}
-named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} \
- ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
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}
{"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
BIND9_ISCCFG_BUILDINCLUDE
BIND9_ISCCC_BUILDINCLUDE
BIND9_ISC_BUILDINCLUDE
-BIND9_ISCPK11_BUILDINCLUDE
BIND9_TOP_BUILDDIR
UNITTESTS
ATFLIBS
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
SHELL'
ac_subst_files='BIND9_MAKE_INCLUDES
BIND9_MAKE_RULES
-LIBISCPK11_API
LIBISC_API
LIBISCCC_API
LIBISCCFG_API
with_gssapi
with_randomdev
enable_threads
+with_libtool
enable_native_pkcs11
with_openssl
with_pkcs11
with_libjson
enable_largefile
with_purify
-with_libtool
enable_backtrace
enable_symtable
enable_ipv6
--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
--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
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)
no)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- USE_PKCS11=''
- PKCS11_TEST=''
- PKCS11_TOOLS=''
+ USE_PKCS11=""
+ PKCS11_TEST=""
+ 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
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
-
-# 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.
-
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"
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=""
-LIBISCPK11_API="$srcdir/lib/iscpk11/api"
-
-
LIBISC_API="$srcdir/lib/isc/api"
# 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"
#
"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" ;;
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)
case "$use_pkcs11" in
no)
AC_MSG_RESULT(no)
- USE_PKCS11=''
- PKCS11_TEST=''
- PKCS11_TOOLS=''
+ USE_PKCS11=""
+ PKCS11_TEST=""
+ 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)
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
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.
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)
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"
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=""
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"
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
# 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@
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}
ISCDEPLIBS = ../../lib/isc/libisc.@A@
-ISCPK11LIBS = ../../lib/iscpk11/libiscpk11.@A@
-
-ISCPK11DEPLIBS = ../../lib/iscpk11/libiscpk11.@A@
-
LIBS = @LIBS@
# Alphabetically
${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
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
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;
#ifdef OPENSSL
EVP_MD_CTX *evp_md_ctx;
#elif PKCS11CRYPTO
- iscpk11_context_t *pk11_ctx;
+ pk11_context_t *pk11_ctx;
#endif
} ctxdata;
};
#include <dns/log.h>
#include <dns/result.h>
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#include "dst_pkcs11.h"
#include "dst_parse.h"
#include "dst_pkcs11.h"
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#define WANT_DH_PRIMES
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
#include <pkcs11/pkcs11.h>
{ CKA_VALUE, NULL, 0 }
};
CK_ATTRIBUTE *attr;
- const iscpk11_object_t *priv;
+ const pk11_object_t *priv;
isc_result_t ret;
unsigned int i;
{ 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;
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;
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;
{ CKA_DERIVE, &truevalue, (CK_ULONG) sizeof(truevalue) },
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *dh = NULL;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *dh = NULL;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
UNUSED(callback);
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_DH, ISC_FALSE, ISC_FALSE, NULL,
&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));
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)
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)
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;
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;
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));
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;
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;
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));
#include "dst_parse.h"
#include "dst_pkcs11.h"
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
/*
* FIPS 186-2 DSA keys:
{ CKA_VALUE, NULL, 0 }
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *dsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *dsa;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
{ CKA_VALUE, NULL, 0 }
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *dsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *dsa;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
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 &&
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)
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);
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,
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;
{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *dsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *dsa;
+ 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,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_DSA, ISC_FALSE, ISC_FALSE, NULL,
(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));
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)
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)
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;
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;
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));
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;
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;
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));
#include "dst_parse.h"
#include "dst_pkcs11.h"
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#define WANT_ECC_CURVES
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
#include <pkcs11/pkcs11.h>
CK_RV rv;
CK_MECHANISM mech = {0, NULL, 0 };
CK_SLOT_ID slotid;
- iscpk11_context_t *pk11_ctx;
- iscpk11_object_t *ec = key->keydata.pkey;
+ pk11_context_t *pk11_ctx;
+ pk11_object_t *ec = key->keydata.pkey;
isc_result_t ret;
UNUSED(key);
else
mech.mechanism = CKM_SHA384;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
memset(pk11_ctx, 0, sizeof(*pk11_ctx));
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);
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 ||
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;
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;
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;
{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) }
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *ec;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *ec;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
REQUIRE(key->key_alg == DST_ALG_ECDSA256 ||
UNUSED(unused);
UNUSED(callback);
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE, ISC_FALSE, NULL,
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));
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)
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)
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;
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;
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));
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;
CK_ULONG cnt;
CK_ATTRIBUTE *attr;
CK_ATTRIBUTE *pubattr;
- iscpk11_object_t *ec;
- iscpk11_object_t *pubec;
- iscpk11_context_t *pk11_ctx = NULL;
+ pk11_object_t *ec;
+ pk11_object_t *pubec;
+ pk11_context_t *pk11_ctx = NULL;
isc_result_t ret;
if (label == NULL)
if (ret != ISC_R_SUCCESS)
goto err;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
DST_RET(ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE,
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;
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));
};
CK_ULONG cnt;
CK_ATTRIBUTE *attr;
- iscpk11_object_t *ec;
- iscpk11_context_t *pk11_ctx = NULL;
+ pk11_object_t *ec;
+ 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));
if (ret != ISC_R_SUCCESS)
goto err;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
DST_RET(ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_EC, ISC_FALSE,
#include "dst_pkcs11.h"
#include "dst_gost.h"
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#define WANT_GOST_PARAMS
-#include <iscpk11/constants.h>
+#include <pk11/constants.h>
#include <pkcs11/pkcs11.h>
(CK_ULONG) sizeof(pk11_gost_paramset) }
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *gost;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *gost;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
(CK_ULONG) sizeof(pk11_gost_paramset) }
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *gost;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *gost;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
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 &&
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)
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);
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,
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;
{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *gost;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *gost;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
UNUSED(unused);
UNUSED(callback);
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_GOST, ISC_FALSE, ISC_FALSE, NULL,
&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));
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)
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)
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;
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;
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));
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;
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;
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;
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));
#include "dst_parse.h"
#include "dst_pkcs11.h"
-#include <iscpk11/internal.h>
+#include <pk11/internal.h>
/*
* Limit the size of public exponents.
};
CK_ATTRIBUTE *attr;
CK_SLOT_ID slotid;
- iscpk11_object_t *rsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *rsa;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
rsa = key->keydata.pkey;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
memset(pk11_ctx, 0, sizeof(*pk11_ctx));
{ CKA_PUBLIC_EXPONENT, NULL, 0 },
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *rsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *rsa;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
rsa = key->keydata.pkey;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(dctx->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(dctx->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,
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));
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)
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,
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,
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;
{ CKA_SIGN, &truevalue, (CK_ULONG) sizeof(truevalue) },
};
CK_ATTRIBUTE *attr;
- iscpk11_object_t *rsa;
- iscpk11_context_t *pk11_ctx;
+ pk11_object_t *rsa;
+ pk11_context_t *pk11_ctx;
isc_result_t ret;
unsigned int i;
UNUSED(callback);
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
return (ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE, ISC_FALSE, NULL,
&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));
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)
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)
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;
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;
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));
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;
CK_ULONG cnt;
CK_ATTRIBUTE *attr;
CK_ATTRIBUTE *pubattr;
- iscpk11_object_t *rsa;
- iscpk11_object_t *pubrsa;
- iscpk11_context_t *pk11_ctx = NULL;
+ pk11_object_t *rsa;
+ pk11_object_t *pubrsa;
+ pk11_context_t *pk11_ctx = NULL;
isc_result_t ret;
if (label == NULL)
if (ret != ISC_R_SUCCESS)
goto err;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
DST_RET(ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,
}
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;
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;
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));
};
CK_ULONG cnt;
CK_ATTRIBUTE *attr;
- iscpk11_object_t *rsa;
- iscpk11_context_t *pk11_ctx = NULL;
+ pk11_object_t *rsa;
+ 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));
if (ret != ISC_R_SUCCESS)
goto err;
- pk11_ctx = (iscpk11_context_t *) isc_mem_get(key->mctx,
- sizeof(*pk11_ctx));
+ pk11_ctx = (pk11_context_t *) isc_mem_get(key->mctx,
+ sizeof(*pk11_ctx));
if (pk11_ctx == NULL)
DST_RET(ISC_R_NOMEMORY);
ret = pk11_get_session(pk11_ctx, OP_RSA, ISC_FALSE,
@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@
@BIND9_MAKE_RULES@
-master_test@EXEEXT@: master_test.@O@ dnstest.@O@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+master_test@EXEEXT@: master_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
test -d testdata || mkdir testdata
test -d testdata/master || mkdir testdata/master
${PERL} ${srcdir}/mkraw.pl < ${srcdir}/testdata/master/master12.data.in \
> 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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+time_test@EXEEXT@: time_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+private_test@EXEEXT@: private_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+update_test@EXEEXT@: update_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+zonemgr_test@EXEEXT@: zonemgr_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+dbiterator_test@EXEEXT@: dbiterator_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+dbdiff_test@EXEEXT@: dbdiff_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+dbversion_test@EXEEXT@: dbversion_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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@ \
- ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCPK11DEPLIBS}
+nsec3_test@EXEEXT@: nsec3_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${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
#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
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);
#define TKEY_RANDOM_AMOUNT 16
#ifdef PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
#endif
#define RETERR(x) do { \
# 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
# 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"
# 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
# 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
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) @<<
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= \
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) @<<
<<
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= \
!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) @<<
!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) @<<
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-@IF PKCS11\r
- <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>\r
-@ELSE PKCS11\r
<AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@END PKCS11\r
<FunctionLevelLinking>false</FunctionLevelLinking>\r
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
-@IF PKCS11\r
- <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@ELSE PKCS11\r
<AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@END PKCS11\r
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
</Link>\r
<FunctionLevelLinking>true</FunctionLevelLinking>\r
<IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
<PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@CRYPTO@@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-@IF PKCS11\r
- <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>\r
-@ELSE PKCS11\r
<AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@END PKCS11\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
<StringPooling>true</StringPooling>\r
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
-@IF PKCS11\r
- <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;libiscpk11.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@ELSE PKCS11\r
<AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@END PKCS11\r
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
@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@
-CDEFINES = @CRYPTO@
+ -I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES}
+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@ \
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@ \
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 \
#include <isc/util.h>
#ifdef PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
#endif
#define ENTROPY_MAGIC ISC_MAGIC('E', 'n', 't', 'e')
#include <isc/util.h>
#if PKCS11CRYPTO || PKCS11CRYPTOWITHHMAC
-#include <iscpk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
#endif
#ifdef ISC_PLATFORM_OPENSSLHASH
#include <isc/util.h>
#if PKCS11CRYPTO
-#include <iscpk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
#endif
#ifdef ISC_PLATFORM_OPENSSLHASH
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = isc
+SUBDIRS = isc pk11 pkcs11
TARGETS =
@BIND9_MAKE_RULES@
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
typedef HMAC_CTX isc_hmacsha512_t;
#elif PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
-typedef iscpk11_context_t isc_hmacsha1_t;
-typedef iscpk11_context_t isc_hmacsha224_t;
-typedef iscpk11_context_t isc_hmacsha256_t;
-typedef iscpk11_context_t isc_hmacsha384_t;
-typedef iscpk11_context_t isc_hmacsha512_t;
+typedef pk11_context_t isc_hmacsha1_t;
+typedef pk11_context_t isc_hmacsha224_t;
+typedef pk11_context_t isc_hmacsha256_t;
+typedef pk11_context_t isc_hmacsha384_t;
+typedef pk11_context_t isc_hmacsha512_t;
#else
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
#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 */
#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
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
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 iscpk11_context_t isc_sha512_t;
+typedef pk11_context_t isc_sha256_t;
+typedef pk11_context_t isc_sha512_t;
#else
# 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@
# 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
/* $Id$ */
-#ifndef ISCPK11_CONSTANTS_H
-#define ISCPK11_CONSTANTS_H 1
+#ifndef PK11_CONSTANTS_H
+#define PK11_CONSTANTS_H 1
-/*! \file iscpk11/constants.h */
+/*! \file pk11/constants.h */
/*%
* Static arrays of data used for key template initalization
};
#endif
-#endif /* ISCPK11_CONSTANTS_H */
+#endif /* PK11_CONSTANTS_H */
/* $Id$ */
-#ifndef ISCPK11_INTERNAL_H
-#define ISCPK11_INTERNAL_H 1
+#ifndef PK11_INTERNAL_H
+#define PK11_INTERNAL_H 1
-/*! \file iscpk11/internal.h */
+/*! \file pk11/internal.h */
ISC_LANG_BEGINDECLS
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 */
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef ISCPK11_PK11_H
-#define ISCPK11_PK11_H 1
+#ifndef PK11_PK11_H
+#define PK11_PK11_H 1
-/*! \file iscpk11/pk11.h */
+/*! \file pk11/pk11.h */
#include <isc/lang.h>
#include <isc/magic.h>
#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;
CK_ATTRIBUTE *repr;
};
-struct iscpk11_context {
+struct pk11_context {
void *handle;
CK_SESSION_HANDLE session;
CK_BBOOL ontoken;
#endif
};
-typedef struct iscpk11_object iscpk11_object_t;
+typedef struct pk11_object pk11_object_t;
typedef enum {
OP_ANY = 0,
OP_EC = 6,
OP_GOST = 7,
OP_MAX = 8
-} iscpk11_optype_t;
+} pk11_optype_t;
/*%
* Function prototypes
* Set the PKCS#11 provider (aka library) path/name.
*/
-isc_result_t pk11_get_session(iscpk11_context_t *ctx,
- iscpk11_optype_t optype,
+isc_result_t pk11_get_session(pk11_context_t *ctx,
+ pk11_optype_t optype,
isc_boolean_t rw,
isc_boolean_t logon,
const char *pin,
* 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.
*/
void pk11_rand_seed_fromfile(const char *randomfile);
-isc_result_t pk11_parse_uri(iscpk11_object_t *obj, const char *label,
- isc_mem_t *mctx, iscpk11_optype_t optype);
+isc_result_t pk11_parse_uri(pk11_object_t *obj, const char *label,
+ isc_mem_t *mctx, pk11_optype_t optype);
ISC_PLATFORM_NORETURN_PRE void
pk11_error_fatalcheck(const char *file, int line,
ISC_LANG_ENDDECLS
-#endif /* ISCPK11_PK11_H */
+#endif /* PK11_PK11_H */
#include <isc/types.h>
#if PKCS11CRYPTO
-#include <iscpk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
#endif
#include <isc/util.h>
#include <config.h>
-#ifdef USE_PKCS11
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dst/result.h>
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#include <pkcs11/cryptoki.h>
#include <pkcs11/pkcs11.h>
static isc_int32_t allocsize = 0;
static isc_boolean_t initialized = ISC_FALSE;
-typedef struct iscpk11_session iscpk11_session_t;
-typedef struct iscpk11_token iscpk11_token_t;
-typedef ISC_LIST(iscpk11_session_t) iscpk11_sessionlist_t;
+typedef struct pk11_session pk11_session_t;
+typedef struct pk11_token pk11_token_t;
+typedef ISC_LIST(pk11_session_t) pk11_sessionlist_t;
-struct iscpk11_session {
+struct pk11_session {
unsigned int magic;
CK_SESSION_HANDLE session;
- ISC_LINK(iscpk11_session_t) link;
- iscpk11_token_t *token;
+ ISC_LINK(pk11_session_t) link;
+ pk11_token_t *token;
};
-struct iscpk11_token {
+struct pk11_token {
unsigned int magic;
unsigned int operations;
- ISC_LINK(iscpk11_token_t) link;
+ ISC_LINK(pk11_token_t) link;
CK_SLOT_ID slotid;
- iscpk11_sessionlist_t sessions;
+ pk11_sessionlist_t sessions;
isc_boolean_t logged;
char name[32];
char manuf[32];
char serial[16];
char pin[PINLEN];
};
-static ISC_LIST(iscpk11_token_t) tokens;
+static ISC_LIST(pk11_token_t) tokens;
-static iscpk11_token_t *rand_token;
-static iscpk11_token_t *best_rsa_token;
-static iscpk11_token_t *best_dsa_token;
-static iscpk11_token_t *best_dh_token;
-static iscpk11_token_t *digest_token;
-static iscpk11_token_t *best_ec_token;
-static iscpk11_token_t *best_gost_token;
+static pk11_token_t *rand_token;
+static pk11_token_t *best_rsa_token;
+static pk11_token_t *best_dsa_token;
+static pk11_token_t *best_dh_token;
+static pk11_token_t *digest_token;
+static pk11_token_t *best_ec_token;
+static pk11_token_t *best_gost_token;
static isc_result_t free_all_sessions(void);
-static isc_result_t free_session_list(iscpk11_sessionlist_t *slist);
-static isc_result_t setup_session(iscpk11_session_t *sp,
- iscpk11_token_t *token,
+static isc_result_t free_session_list(pk11_sessionlist_t *slist);
+static isc_result_t setup_session(pk11_session_t *sp,
+ pk11_token_t *token,
isc_boolean_t rw);
static void choose_slots(void);
-static isc_result_t token_login(iscpk11_session_t *sp);
+static isc_result_t token_login(pk11_session_t *sp);
static char *percent_decode(char *x, size_t *len);
static isc_boolean_t pk11strcmp(const char *x, size_t lenx,
const char *y, size_t leny);
-static CK_ATTRIBUTE *push_attribute(iscpk11_object_t *obj,
+static CK_ATTRIBUTE *push_attribute(pk11_object_t *obj,
isc_mem_t *mctx,
size_t len);
static isc_mutex_t alloclock;
static isc_mutex_t sessionlock;
-static iscpk11_sessionlist_t actives;
+static pk11_sessionlist_t actives;
static CK_C_INITIALIZE_ARGS pk11_init_args = {
NULL_PTR, /* CreateMutex */
else {
ptr = malloc(size);
if (ptr != NULL)
- allocsize += size;
+ allocsize += (int)size;
}
UNLOCK(&alloclock);
isc_mem_put(pk11_mctx, ptr, size);
else {
if (ptr != NULL)
- allocsize -= size;
+ allocsize -= (int)size;
free(ptr);
}
UNLOCK(&alloclock);
isc_result_t
dst__pkcs11_destroy(void) {
- iscpk11_token_t *token, *next;
+ pk11_token_t *token, *next;
isc_result_t ret;
ret = free_all_sessions();
pk11_rand_bytes(unsigned char *buf, int num) {
isc_result_t ret;
CK_RV rv;
- iscpk11_context_t ctx;
+ pk11_context_t ctx;
ret = pk11_get_session(&ctx, OP_RAND, ISC_FALSE, ISC_FALSE, NULL, 0);
if (ret != ISC_R_SUCCESS)
void
pk11_rand_seed_fromfile(const char *randomfile) {
- iscpk11_context_t ctx;
+ pk11_context_t ctx;
FILE *stream = NULL;
size_t cc = 0;
isc_result_t ret;
}
isc_result_t
-pk11_get_session(iscpk11_context_t *ctx, iscpk11_optype_t optype,
+pk11_get_session(pk11_context_t *ctx, pk11_optype_t optype,
isc_boolean_t rw, isc_boolean_t logon,
const char *pin, CK_SLOT_ID slot)
{
- iscpk11_token_t *token = NULL;
- iscpk11_sessionlist_t *freelist;
- iscpk11_session_t *sp;
+ pk11_token_t *token = NULL;
+ pk11_sessionlist_t *freelist;
+ pk11_session_t *sp;
isc_result_t ret = ISC_R_SUCCESS;
dst__pkcs11_init(NULL, NULL);
/* wait for initialization to finish */
UNLOCK(&sessionlock);
- memset(ctx, 0, sizeof(iscpk11_context_t));
+ memset(ctx, 0, sizeof(pk11_context_t));
ctx->handle = NULL;
ctx->session = CK_INVALID_HANDLE;
switch(optype) {
}
void
-pk11_return_session(iscpk11_context_t *ctx) {
- iscpk11_session_t *sp = (iscpk11_session_t *) ctx->handle;
+pk11_return_session(pk11_context_t *ctx) {
+ pk11_session_t *sp = (pk11_session_t *) ctx->handle;
if (sp == NULL)
return;
static isc_result_t
free_all_sessions(void) {
- iscpk11_token_t *token;
+ pk11_token_t *token;
isc_result_t ret = ISC_R_SUCCESS;
isc_result_t oret;
}
static isc_result_t
-free_session_list(iscpk11_sessionlist_t *slist) {
- iscpk11_session_t *sp;
+free_session_list(pk11_sessionlist_t *slist) {
+ pk11_session_t *sp;
CK_RV rv;
isc_result_t ret;
}
static isc_result_t
-setup_session(iscpk11_session_t *sp, iscpk11_token_t *token,
+setup_session(pk11_session_t *sp, pk11_token_t *token,
isc_boolean_t rw)
{
CK_RV rv;
}
static isc_result_t
-token_login(iscpk11_session_t *sp) {
+token_login(pk11_session_t *sp) {
CK_RV rv;
- iscpk11_token_t *token = sp->token;
+ pk11_token_t *token = sp->token;
isc_result_t ret = ISC_R_SUCCESS;
LOCK(&sessionlock);
CK_SLOT_ID slot;
CK_SLOT_ID_PTR slotList;
CK_ULONG slotCount;
- iscpk11_token_t *token;
+ pk11_token_t *token;
unsigned int i;
slotCount = 0;
}
CK_SLOT_ID
-pk11_get_best_token(iscpk11_optype_t optype) {
- iscpk11_token_t *token = NULL;
+pk11_get_best_token(pk11_optype_t optype) {
+ pk11_token_t *token = NULL;
switch (optype) {
case OP_RAND:
}
CK_ATTRIBUTE *
-pk11_attribute_first(const iscpk11_object_t *obj) {
+pk11_attribute_first(const pk11_object_t *obj) {
return (obj->repr);
}
CK_ATTRIBUTE *
-pk11_attribute_next(const iscpk11_object_t *obj, CK_ATTRIBUTE *attr) {
+pk11_attribute_next(const pk11_object_t *obj, CK_ATTRIBUTE *attr) {
CK_ATTRIBUTE *next;
next = attr + 1;
}
CK_ATTRIBUTE *
-pk11_attribute_bytype(const iscpk11_object_t *obj, CK_ATTRIBUTE_TYPE type) {
+pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) {
CK_ATTRIBUTE *attr;
for(attr = pk11_attribute_first(obj);
}
static CK_ATTRIBUTE *
-push_attribute(iscpk11_object_t *obj, isc_mem_t *mctx, size_t len) {
+push_attribute(pk11_object_t *obj, isc_mem_t *mctx, size_t len) {
CK_ATTRIBUTE *old = obj->repr;
CK_ATTRIBUTE *attr;
CK_BYTE cnt = obj->attrcnt;
#define DST_RET(a) { ret = a; goto err; }
isc_result_t
-pk11_parse_uri(iscpk11_object_t *obj, const char *label,
- isc_mem_t *mctx, iscpk11_optype_t optype)
+pk11_parse_uri(pk11_object_t *obj, const char *label,
+ isc_mem_t *mctx, pk11_optype_t optype)
{
CK_ATTRIBUTE *attr;
- iscpk11_token_t *token = NULL;
+ pk11_token_t *token = NULL;
char *uri, *p, *a, *na, *v;
size_t len, l;
FILE *stream = NULL;
void
pk11_dump_tokens(void)
{
- iscpk11_token_t *token;
+ pk11_token_t *token;
isc_boolean_t first;
printf("DEFAULTS\n");
printf(")\n");
}
}
-
-#else /* USE_PKCS11 */
-
-#include <isc/util.h>
-
-EMPTY_TRANSLATION_UNIT
-
-#endif /* USE_PKCS11 */
#include <isc/util.h>
#if PKCS11CRYPTO
-#include <iscpk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
#endif
#ifdef ISC_PLATFORM_OPENSSLHASH
#include <isc/util.h>
#if PKCS11CRYPTO
-#include <iscpk11/internal.h>
-#include <iscpk11/pk11.h>
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
#endif
#ifdef ISC_PLATFORM_OPENSSLHASH
ISCLIBS = ../libisc.@A@
ISCDEPLIBS = ../libisc.@A@
-ISCPK11LIBS = ../../iscpk11/libiscpk11.@A@
LIBS = @LIBS@ @ATFLIBS@
taskpool_test@EXEEXT@: taskpool_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- taskpool_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ taskpool_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
task_test@EXEEXT@: task_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- task_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ task_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
socket_test@EXEEXT@: socket_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- socket_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ socket_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- hash_test.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ hash_test.@O@ ${ISCLIBS} ${LIBS}
lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- lex_test.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ lex_test.@O@ ${ISCLIBS} ${LIBS}
queue_test@EXEEXT@: queue_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- queue_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ queue_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
symtab_test@EXEEXT@: symtab_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- symtab_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ symtab_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
parse_test@EXEEXT@: parse_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- parse_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ parse_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
sockaddr_test@EXEEXT@: sockaddr_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- sockaddr_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ sockaddr_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
pool_test@EXEEXT@: pool_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- pool_test.@O@ isctest.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ pool_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
regex_test@EXEEXT@: regex_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- regex_test.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ regex_test.@O@ ${ISCLIBS} ${LIBS}
safe_test@EXEEXT@: safe_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- safe_test.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ safe_test.@O@ ${ISCLIBS} ${LIBS}
time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
- time_test.@O@ \
- ${ISCLIBS} ${ISCPK11LIBS} ${LIBS}
+ time_test.@O@ ${ISCLIBS} ${LIBS}
unit::
sh ${top_srcdir}/unit/unittest.sh
CWARNINGS =
# Alphabetically
-OBJS = @ISC_IPV6_O@ \
+OBJS = @ISC_IPV6_O@ @ISC_PK11_API_O@ \
app.@O@ dir.@O@ entropy.@O@ errno2result.@O@ file.@O@ \
fsaccess.@O@ interfaceiter.@O@ keyboard.@O@ net.@O@ \
os.@O@ resource.@O@ socket.@O@ stdio.@O@ stdtime.@O@ \
strerror.@O@ syslog.@O@ time.@O@
# Alphabetically
-SRCS = @ISC_IPV6_C@ \
+SRCS = @ISC_IPV6_C@ @ISC_PK11_API_C@ \
app.c dir.c entropy.c errno2result.c file.c \
fsaccess.c interfaceiter.c keyboard.c net.c \
os.c resource.c socket.c stdio.c stdtime.c \
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = isc
+SUBDIRS = isc pkcs11
TARGETS =
@BIND9_MAKE_RULES@
#include <config.h>
-#ifdef USE_PKCS11
-
#include <string.h>
#include <dlfcn.h>
#include <isc/thread.h>
#include <isc/util.h>
-#include <dst/result.h>
-
#include <pkcs11/cryptoki.h>
#include <pkcs11/pkcs11.h>
#define KEEP_PKCS11_NAMES
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
static void *hPK11 = NULL;
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (*sym)(hSession, RandomData, ulRandomLen);
}
-
-#else /* USE_PKCS11 */
-
-#include <isc/util.h>
-
-EMPTY_TRANSLATION_UNIT
-
-#endif /* USE_PKCS11 */
# Alphabetically
OBJS = condition.@O@ dir.@O@ file.@O@ fsaccess.@O@ once.@O@ \
- stdtime.@O@ thread.@O@ time.@O@
+ stdtime.@O@ thread.@O@ time.@O@ @ISC_PK11_API_O@
# Alphabetically
SRCS = condition.c dir.c file.c once.c fsaccess.c \
- stdtime.c thread.c time.c
+ stdtime.c thread.c time.c @ISC_PK11_API_C@
SUBDIRS = include
TARGETS = ${OBJS}
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = isc
+SUBDIRS = isc pkcs11
TARGETS =
@BIND9_MAKE_RULES@
#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
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $
+# $Id$
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = pkcs11
+HEADERS = cryptoki.h
+SUBDIRS =
TARGETS =
@BIND9_MAKE_RULES@
+
+installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/pkcs11
+
+install:: installdirs
+ for i in ${HEADERS}; do \
+ ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/pkcs11 ; \
+ done
NTReportError
closelog
+@IF PKCS11
+dst__pkcs11_init
+dst__pkcs11_destroy
+getpassphrase
+@END PKCS11
isc___socketmgr_maxudp
isc__app_block
isc__app_finish
isc_win32os_servicepackminor
isc_win32os_versioncheck
openlog
+@IF PKCS11
+pk11_attribute_bytype
+pk11_attribute_first
+pk11_attribute_next
+pk11_dump_tokens
+pk11_error_fatalcheck
+pk11_get_best_token
+pk11_get_lib_name
+pk11_get_session
+pk11_mem_get
+pk11_mem_put
+pk11_numbits
+pk11_parse_uri
+pk11_rand_bytes
+pk11_rand_seed_fromfile
+pk11_return_session
+pk11_set_lib_name
+pk11_shutdown
+pkcs_C_CloseSession
+pkcs_C_CreateObject
+pkcs_C_DeriveKey
+pkcs_C_DestroyObject
+pkcs_C_DigestFinal
+pkcs_C_DigestInit
+pkcs_C_DigestUpdate
+pkcs_C_Finalize
+pkcs_C_FindObjects
+pkcs_C_FindObjectsFinal
+pkcs_C_FindObjectsInit
+pkcs_C_GenerateKey
+pkcs_C_GenerateKeyPair
+pkcs_C_GenerateRandom
+pkcs_C_GetAttributeValue
+pkcs_C_GetMechanismInfo
+pkcs_C_GetSlotList
+pkcs_C_GetTokenInfo
+pkcs_C_Initialize
+pkcs_C_Login
+pkcs_C_Logout
+pkcs_C_OpenSession
+pkcs_C_SeedRandom
+pkcs_C_SetAttributeValue
+pkcs_C_Sign
+pkcs_C_SignFinal
+pkcs_C_SignInit
+pkcs_C_SignUpdate
+pkcs_C_Verify
+pkcs_C_VerifyFinal
+pkcs_C_VerifyInit
+pkcs_C_VerifyUpdate
+@END PKCS11
syslog
@IF NOLONGER
; Exported Data
# 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 "LIBISC_EXPORTS" @COPTY@ /FD /c
@IF PKCS11
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" /D "BIND9" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
@ELSE PKCS11
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
@END PKCS11
# 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 ../../iscpk11/win32/Release/libiscpk11.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisc.dll"
-@ELSE PKCS11
# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisc.dll"
-@END PKCS11
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "libisc - @PLATFORM@ Debug"
# 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 "LIBISC_EXPORTS" @COPTY@ /FD /GZ /c
@IF PKCS11
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" /D "BIND9" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
@ELSE PKCS11
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
@END PKCS11
# 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 ../../iscpk11/win32/Debug/libiscpk11.lib /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
-@ELSE PKCS11
# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
-@END PKCS11
!ENDIF
SOURCE=.\os.c
# End Source File
+@IF PKCS11
+# Begin Source File
+
+SOURCE=.\pk11_api.c
+# End Source File
+@END PKCS11
# Begin Source File
SOURCE=.\resource.c
SOURCE=..\include\isc\interfaceiter.h
# End Source File
+@IF PKCS11
+# Begin Source File
+
+SOURCE=..\include\pk11\internal.h
+# End Source File
+@END PKCS11
# Begin Source File
SOURCE=.\include\isc\ipv6.h
SOURCE=..\include\isc\parseint.h
# End Source File
+@IF PKCS11
+# Begin Source File
+
+SOURCE=..\include\pk11\pk11.h
+# End Source File
+@END PKCS11
# Begin Source File
SOURCE=..\include\isc\pool.h
SOURCE=..\parseint.c
# End Source File
+@IF PKCS11
+# Begin Source File
+
+SOURCE=..\pk11.c
+# End Source File
+@END PKCS11
# Begin Source File
SOURCE=..\pool.c
-@erase "$(INTDIR)\ondestroy.obj"
-@erase "$(INTDIR)\os.obj"
-@erase "$(INTDIR)\parseint.obj"
+@IF PKCS11
+ -@erase "$(INTDIR)\pk11.obj"
+ -@erase "$(INTDIR)\pk11_api.obj"
+@END PKCS11
-@erase "$(INTDIR)\pool.obj"
-@erase "$(INTDIR)\portset.obj"
-@erase "$(INTDIR)\quota.obj"
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@IF PKCS11
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @LIBXML2_INC@ /D "BIND9" @CRYPTO@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.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 "win32" /I "../../isccfg/include" @LIBXML2_INC@ /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
@END PKCS11
BSC32_SBRS= \
LINK32=link.exe
-@IF PKCS11
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../iscpk11/win32/Release/libiscpk11.lib $(LIBXML) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib"
-@ELSE PKCS11
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib"
-@END PKCS11
DEF_FILE= \
".\libisc.def"
LINK32_OBJS= \
"$(INTDIR)\ntpaths.obj" \
"$(INTDIR)\once.obj" \
"$(INTDIR)\os.obj" \
+@IF PKCS11
+ "$(INTDIR)\pk11_api.obj" \
+@END PKCS11
"$(INTDIR)\resource.obj" \
"$(INTDIR)\socket.obj" \
"$(INTDIR)\stdio.obj" \
"$(INTDIR)\netaddr.obj" \
"$(INTDIR)\netscope.obj" \
"$(INTDIR)\ondestroy.obj" \
+@IF PKCS11
+ "$(INTDIR)\pk11.obj" \
+@END PKCS11
"$(INTDIR)\quota.obj" \
"$(INTDIR)\radix.obj" \
"$(INTDIR)\random.obj" \
-@erase "$(INTDIR)\os.sbr"
-@erase "$(INTDIR)\parseint.obj"
-@erase "$(INTDIR)\parseint.sbr"
+@IF PKCS11
+ -@erase "$(INTDIR)\pk11.obj"
+ -@erase "$(INTDIR)\pk11_api.obj"
+@END PKCS11
-@erase "$(INTDIR)\pool.obj"
-@erase "$(INTDIR)\pool.sbr"
-@erase "$(INTDIR)\portset.obj"
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@IF PKCS11
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../iscpk11/win32/include" /I "../../iscpk11/include" @LIBXML2_INC@ /D "BIND9" @CRYPTO@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /I "../../dns/win32/include" /I "../../dns/include" @LIBXML2_INC@ /D "BIND9" @CRYPTO@ @PK11_LIB_LOCATION@ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.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 "win32" /I "../../isccfg/include" @LIBXML2_INC@ /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
@END PKCS11
"$(INTDIR)\ntpaths.sbr" \
"$(INTDIR)\once.sbr" \
"$(INTDIR)\os.sbr" \
+@IF PKCS11
+ "$(INTDIR)\pk11_api.sbr" \
+@END PKCS11
"$(INTDIR)\resource.sbr" \
"$(INTDIR)\socket.sbr" \
"$(INTDIR)\stdio.sbr" \
"$(INTDIR)\netaddr.sbr" \
"$(INTDIR)\netscope.sbr" \
"$(INTDIR)\ondestroy.sbr" \
+@IF PKCS11
+ "$(INTDIR)\pk11.sbr" \
+@END PKCS11
"$(INTDIR)\quota.sbr" \
"$(INTDIR)\radix.sbr" \
"$(INTDIR)\random.sbr" \
<<
LINK32=link.exe
-@IF PKCS11
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../iscpk11/win32/Debug/libiscpk11.lib $(LIBXML) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept
-@ELSE PKCS11
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept
-@END PKCS11
DEF_FILE= \
".\libisc.def"
LINK32_OBJS= \
"$(INTDIR)\ntpaths.obj" \
"$(INTDIR)\once.obj" \
"$(INTDIR)\os.obj" \
+@IF PKCS11
+ "$(INTDIR)\pk11_api.obj" \
+@END PKCS11
"$(INTDIR)\resource.obj" \
"$(INTDIR)\socket.obj" \
"$(INTDIR)\stdio.obj" \
"$(INTDIR)\netaddr.obj" \
"$(INTDIR)\netscope.obj" \
"$(INTDIR)\ondestroy.obj" \
+@IF PKCS11
+ "$(INTDIR)\pk11.obj" \
+@END PKCS11
"$(INTDIR)\quota.obj" \
"$(INTDIR)\radix.obj" \
"$(INTDIR)\random.obj" \
"$(INTDIR)\os.obj" "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
+!ENDIF
+
+SOURCE=.\pk11_api.c
+
+!IF "$(CFG)" == "libisc - @PLATFORM@ Release"
+
+
+"$(INTDIR)\pk11_api.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "libisc - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\pk11_api.obj" "$(INTDIR)\pk11_api.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
!ENDIF
SOURCE=.\resource.c
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ENDIF
+
+SOURCE=..\pk11.c
+
+!IF "$(CFG)" == "libisc - @PLATFORM@ Release"
+
+
+"$(INTDIR)\pk11.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "libisc - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\pk11.obj" "$(INTDIR)\pk11.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
!ENDIF
SOURCE=..\pool.c
<ClInclude Include="..\include\isc\xml.h">\r
<Filter>Library Header Files</Filter>\r
</ClInclude>\r
+@IF PKCS11\r
+ <ClInclude Include="..\include\pk11\constants.h">\r
+ <Filter>Library Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\include\pk11\internal.h">\r
+ <Filter>Library Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\include\pk11\pk11.h">\r
+ <Filter>Library Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\include\pkcs11\pkcs11.h">\r
+ <Filter>Pkcs11 Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\include\pkcs11\pkcs11f.h">\r
+ <Filter>Pkcs11 Header Files</Filter>\r
+ </ClInclude>\r
+ <ClInclude Include="..\include\pkcs11\pkcs11t.h">\r
+ <Filter>Pkcs11 Header Files</Filter>\r
+ </ClInclude>\r
+@END PKCS11\r
<ClInclude Include="include\isc\bind_registry.h">\r
<Filter>Win32 Header Files</Filter>\r
</ClInclude>\r
<ClInclude Include="unistd.h">\r
<Filter>Win32 Header Files</Filter>\r
</ClInclude>\r
+@IF PKCS11\r
+ <ClInclude Include="include\pkcs11\cryptoki.h">\r
+ <Filter>Win32 Header Files</Filter>\r
+ </ClInclude>\r
+@END PKCS11\r
@IF ATOMIC\r
<ClInclude Include="include\isc\atomic.h">\r
@ELSE ATOMIC\r
<ClCompile Include="win32os.c">\r
<Filter>Win32 Source Files</Filter>\r
</ClCompile>\r
+@IF PKCS11\r
+ <ClCompile Include="pk11_api.c">\r
+ <Filter>Win32 Source Files</Filter>\r
+ </ClCompile>\r
+@END PKCS11\r
<ClCompile Include="..\assertions.c">\r
<Filter>Library Source Files</Filter>\r
</ClCompile>\r
<ClCompile Include="..\tm.c">\r
<Filter>Library Source Files</Filter>\r
</ClCompile>\r
+@IF PKCS11\r
+ <ClCompile Include="..\pk11.c">\r
+ <Filter>Library Source Files</Filter>\r
+ </ClCompile>\r
+@END PKCS11\r
</ItemGroup>\r
</Project>\r
</PrecompiledHeader>\r
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
- <PreprocessorDefinitions>BIND9;@CRYPTO@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@IF PKCS11\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@ELSE PKCS11\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@END PKCS11\r
<FunctionLevelLinking>false</FunctionLevelLinking>\r
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
<SubSystem>Console</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
-@IF PKCS11\r
- <AdditionalLibraryDirectories>..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libiscpk11.lib;@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@ELSE PKCS11\r
<AdditionalDependencies>@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@END PKCS11\r
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
</Link>\r
<Optimization>MaxSpeed</Optimization>\r
<FunctionLevelLinking>true</FunctionLevelLinking>\r
<IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
- <PreprocessorDefinitions>BIND9;@CRYPTO@WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@IF PKCS11\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <PreprocessorDefinitions>BIND9;@CRYPTO@@PK11_LIB_LOCATION@WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@ELSE PKCS11\r
+ <PreprocessorDefinitions>BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@END PKCS11\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
<OptimizeReferences>true</OptimizeReferences>\r
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
-@IF PKCS11\r
- <AdditionalLibraryDirectories>..\..\iscpk11\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libiscpk11.lib;@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@ELSE PKCS11\r
<AdditionalDependencies>@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-@END PKCS11\r
<ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
<ClInclude Include="..\include\isc\util.h" />\r
<ClInclude Include="..\include\isc\version.h" />\r
<ClInclude Include="..\include\isc\xml.h" />\r
+@IF PKCS11\r
+ <ClInclude Include="..\include\pk11\constants.h" />\r
+ <ClInclude Include="..\include\pk11\internal.h" />\r
+ <ClInclude Include="..\include\pk11\pk11.h" />\r
+ <ClInclude Include="..\include\pkcs11\pkcs11.h" />\r
+ <ClInclude Include="..\include\pkcs11\pkcs11f.h" />\r
+ <ClInclude Include="..\include\pkcs11\pkcs11t.h" />\r
+@END PKCS11\r
@IF ATOMIC\r
<ClInclude Include="include\isc\atomic.h" />\r
@ELSE ATOMIC\r
<ClInclude Include="include\isc\win32os.h" />\r
<ClInclude Include="syslog.h" />\r
<ClInclude Include="unistd.h" />\r
+@IF PKCS11\r
+ <ClInclude Include="include\pkcs11\cryptoki.h" />\r
+@END PKCS11\r
<ClInclude Include="..\..\versions.h" />\r
</ItemGroup>\r
<ItemGroup>\r
<ClCompile Include="..\taskpool.c" />\r
<ClCompile Include="..\timer.c" />\r
<ClCompile Include="..\tm.c" />\r
+@IF PKCS11\r
+ <ClCompile Include="..\pk11.c" />\r
+@END PKCS11\r
<ClCompile Include="app.c" />\r
<ClCompile Include="condition.c" />\r
<ClCompile Include="dir.c" />\r
<ClCompile Include="time.c" />\r
<ClCompile Include="version.c" />\r
<ClCompile Include="win32os.c" />\r
+@IF PKCS11\r
+ <ClCompile Include="pk11_api.c" />\r
+@END PKCS11\r
</ItemGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
+++ /dev/null
-echo off
-rem
-rem Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
-rem
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
-
-rem mklib.bat Release|Debug
-rem This script builds the libisc.lib import library file needed by
-rem libiscpk11 (circular dependency break)
-
-if NOT Exist .\%1 mkdir .\%1
-
-lib.exe /nologo @MACHINE@ /def:".\libisc.def" /out:".\%1\libisc.lib"
#include <config.h>
-#ifdef USE_PKCS11
-
#include <string.h>
#include <windows.h>
#include <isc/thread.h>
#include <isc/util.h>
-#include <dst/result.h>
-
-#include <iscpk11/pk11.h>
-#include <iscpk11/internal.h>
+#include <pk11/pk11.h>
+#include <pk11/internal.h>
#define HAVE_GETPASSPHRASE
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (*sym)(hSession, RandomData, ulRandomLen);
}
-
-#endif
when = isc_tm_timegm(&t_tm);
if (when == -1)
return (ISC_R_UNEXPECTED);
- isc_time_set(t, when, 0);
+ isc_time_set(t, (unsigned int)when, 0);
return (ISC_R_SUCCESS);
}
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" @COPTY@ /FD /c
-@IF PKCS11
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" @COPTY@ /FD /c
-@ELSE PKCS11
# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" @COPTY@ /FD /c
-@END PKCS11
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" @COPTY@ /FD /GZ /c
-@IF PKCS11
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" /FR @COPTY@ /FD /GZ /c
-@ELSE PKCS11
# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_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
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-@IF PKCS11
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-@ELSE PKCS11
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-@END PKCS11
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-@IF PKCS11
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/iscpk11/win32/include" /I "../../../lib/iscpk11/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-@ELSE PKCS11
CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @CRYPTO@ /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-@END PKCS11
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc"
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<PreprocessorDefinitions>WIN32;USE_MD5;@CRYPTO@_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-@IF PKCS11\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@ELSE PKCS11\r
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@END PKCS11\r
<FunctionLevelLinking>false</FunctionLevelLinking>\r
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
<AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
<FunctionLevelLinking>true</FunctionLevelLinking>\r
<IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
<PreprocessorDefinitions>WIN32;USE_MD5;@CRYPTO@NDEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-@IF PKCS11\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\iscpk11\win32\include;..\..\iscpk11\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@ELSE PKCS11\r
<AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-@END PKCS11\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
<StringPooling>true</StringPooling>\r
<PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+++ /dev/null
-# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-top_srcdir = @top_srcdir@
-
-@BIND9_VERSION@
-
-@LIBISCPK11_API@
-
-@BIND9_MAKE_INCLUDES@
-
-PROVIDER = @PKCS11_PROVIDER@
-
-CINCLUDES = -I. ${ISC_INCLUDES} ${DNS_INCLUDES} ${ISCPK11_INCLUDES}
-
-CDEFINES = @CRYPTO@ @USE_PKCS11@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
-CWARNINGS =
-
-ISCPK11LIBS = ../../lib/iscpk11/libiscpk11.@A@
-
-ISCDEPLIBS = ../../lib/isc/libisc.@A@
-
-LIBS = @LIBS@
-
-SUBDIRS = include unix
-
-# Alphabetically
-UNIXOBJS = unix/pk11_api.@O@
-
-OBJS = pk11.@O@ version.@O@ ${UNIXOBJS}
-
-# Alphabetically
-SRCS = pk11.c version.c
-
-
-TARGETS = timestamp
-
-@BIND9_MAKE_RULES@
-
-version.@O@: version.c
- ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
- -DVERSION=\"${VERSION}\" \
- -DLIBINTERFACE=${LIBINTERFACE} \
- -DLIBREVISION=${LIBREVISION} \
- -DLIBAGE=${LIBAGE} \
- -c ${srcdir}/version.c
-
-libiscpk11.@SA@: ${OBJS}
- ${AR} ${ARFLAGS} $@ ${OBJS}
- ${RANLIB} $@
-
-libiscpk11.la: ${OBJS}
- ${LIBTOOL_MODE_LINK} \
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libiscpk11.la -rpath ${libdir} \
- -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
- ${OBJS} ${LIBS}
-
-timestamp: libiscpk11.@A@
- touch timestamp
-
-installdirs:
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
-
-install:: timestamp installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libiscpk11.@A@ ${DESTDIR}${libdir}
-
-clean distclean::
- rm -f libiscpk11.@A@ libiscpk11.la timestamp
+++ /dev/null
-# LIBINTERFACE ranges
-# 9.6: 50-59, 110-119
-# 9.7: 60-79
-# 9.8: 80-89
-# 9.9: 90-109
-# 9.10: 140-149
-LIBINTERFACE = 140
-LIBREVISION = 0
-LIBAGE = 0
+++ /dev/null
-# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.5 2007/06/19 23:47:22 tbox Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-top_srcdir = @top_srcdir@
-
-SUBDIRS = pkcs11 iscpk11
-TARGETS =
-
-@BIND9_MAKE_RULES@
+++ /dev/null
-/*
- * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
-
-/*! \file iscpk11/version.h */
-
-#include <isc/platform.h>
-
-LIBISCPK11_EXTERNAL_DATA extern const char pk11_version[];
-
-LIBISCPK11_EXTERNAL_DATA extern const unsigned int pk11_libinterface;
-LIBISCPK11_EXTERNAL_DATA extern const unsigned int pk11_librevision;
-LIBISCPK11_EXTERNAL_DATA extern const unsigned int pk11_libage;
+++ /dev/null
-# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.44 2009/12/05 23:31:41 each Exp $
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-top_srcdir = @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES = -I${srcdir}/include \
- -I../include \
- -I${srcdir}/../include \
- ${ISC_INCLUDES} ${DNS_INCLUDES}
-
-CDEFINES = @CRYPTO@ @USE_PKCS11@
-CWARNINGS =
-
-# Alphabetically
-OBJS = pk11_api.@O@
-
-# Alphabetically
-SRCS = pk11_api.c
-
-SUBDIRS = include
-TARGETS = ${OBJS}
-
-@BIND9_MAKE_RULES@
-
+++ /dev/null
-/*
- * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
-
-/*! \file */
-
-#include <iscpk11/version.h>
-
-const char pk11_version[] = VERSION;
-
-const unsigned int pk11_libinterface = LIBINTERFACE;
-const unsigned int pk11_librevision = LIBREVISION;
-const unsigned int pk11_libage = LIBAGE;
-
+++ /dev/null
-/*
- * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:51 tbox Exp $ */
-
-#include <windows.h>
-#include <signal.h>
-
-/*
- * Called when we enter the DLL
- */
-__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL,
- DWORD fdwReason, LPVOID lpvReserved)
-{
- switch (fdwReason)
- {
- /*
- * The DLL is loading due to process
- * initialization or a call to LoadLibrary.
- */
- case DLL_PROCESS_ATTACH:
- break;
-
- /*
- * The attached process creates a new thread.
- */
- case DLL_THREAD_ATTACH:
- break;
-
- /* The thread of the attached process terminates. */
- case DLL_THREAD_DETACH:
- break;
-
- /*
- * The DLL is unloading from a process due to
- * process termination or a call to FreeLibrary.
- */
- case DLL_PROCESS_DETACH:
- break;
-
- default:
- break;
- }
- return (TRUE);
-}
-
+++ /dev/null
-LIBRARY libiscpk11
-
-; Exported Functions
-EXPORTS
-
-@IF PKCS11
-dst__pkcs11_init
-dst__pkcs11_destroy
-getpassphrase
-pk11_attribute_bytype
-pk11_attribute_first
-pk11_attribute_next
-pk11_dump_tokens
-pk11_error_fatalcheck
-pk11_get_best_token
-pk11_get_lib_name
-pk11_get_session
-pk11_mem_get
-pk11_mem_put
-pk11_numbits
-pk11_parse_uri
-pk11_rand_bytes
-pk11_rand_seed_fromfile
-pk11_return_session
-pk11_set_lib_name
-pk11_shutdown
-pkcs_C_CloseSession
-pkcs_C_CreateObject
-pkcs_C_DeriveKey
-pkcs_C_DestroyObject
-pkcs_C_DigestFinal
-pkcs_C_DigestInit
-pkcs_C_DigestUpdate
-pkcs_C_Finalize
-pkcs_C_FindObjects
-pkcs_C_FindObjectsFinal
-pkcs_C_FindObjectsInit
-pkcs_C_GenerateKey
-pkcs_C_GenerateKeyPair
-pkcs_C_GenerateRandom
-pkcs_C_GetAttributeValue
-pkcs_C_GetMechanismInfo
-pkcs_C_GetSlotList
-pkcs_C_GetTokenInfo
-pkcs_C_Initialize
-pkcs_C_Login
-pkcs_C_Logout
-pkcs_C_OpenSession
-pkcs_C_SeedRandom
-pkcs_C_SetAttributeValue
-pkcs_C_Sign
-pkcs_C_SignFinal
-pkcs_C_SignInit
-pkcs_C_SignUpdate
-pkcs_C_Verify
-pkcs_C_VerifyFinal
-pkcs_C_VerifyInit
-pkcs_C_VerifyUpdate
-@END PKCS11
-
-; Exported Data
+++ /dev/null
-# Microsoft Developer Studio Project File - Name="libiscpk11" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
-
-CFG=libiscpk11 - @PLATFORM@ Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libiscpk11.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libiscpk11.mak" CFG="libiscpk11 - @PLATFORM@ Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libiscpk11 - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE "libiscpk11 - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libiscpk11_EXPORTS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/iscpk11/win32" /I "../../../lib/iscpk11/win32/include" @LIBXML2_INC@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" @CRYPTO@ @USE_PKCS11@ @PK11_LIB_LOCATION@ /D "LIBISCPK11_EXPORTS" @COPTY@ /FD /c
-# SUBTRACT CPP /X
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# 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@
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libiscpk11.dll"
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libiscpk11_EXPORTS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/iscpk11/win32" /I "../../../lib/iscpk11/win32/include" @LIBXML2_INC@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @CRYPTO@ @USE_PKCS11@ @PK11_LIB_LOCATION@ /D "LIBISCPK11_EXPORTS" /FR @COPTY@ /FD /GZ /c
-# SUBTRACT CPP /X
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# 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
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libiscpk11.dll" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "libiscpk11 - @PLATFORM@ Release"
-# Name "libiscpk11 - @PLATFORM@ Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\DLLMain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\pk11.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pk11_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\version.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\include\iscpk11\pk11.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\iscpk11\internal.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\libiscpk11.def
-# End Source File
-# End Target
-# End Project
+++ /dev/null
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libiscpk11"=".\libiscpk11.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+++ /dev/null
-# Microsoft Developer Studio Generated NMAKE File, Based on libiscpk11.dsp
-!IF "$(CFG)" == ""
-CFG=libiscpk11 - @PLATFORM@ Debug
-!MESSAGE No configuration specified. Defaulting to libiscpk11 - @PLATFORM@ Debug.
-!ENDIF
-
-!IF "$(CFG)" != "libiscpk11 - @PLATFORM@ Release" && "$(CFG)" != "libiscpk11 - @PLATFORM@ Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libiscpk11.mak" CFG="libiscpk11 - @PLATFORM@ Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libiscpk11 - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE "libiscpk11 - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-_VC_MANIFEST_INC=0
-_VC_MANIFEST_BASENAME=__VC80
-!ELSE
-_VC_MANIFEST_INC=1
-_VC_MANIFEST_BASENAME=__VC80.Debug
-!ENDIF
-
-####################################################
-# Specifying name of temporary resource file used only in incremental builds:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
-!else
-_VC_MANIFEST_AUTO_RES=
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
-
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
-
-!endif
-####################################################
-# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
- $(_VC_MANIFEST_BASENAME).auto.rc \
- $(_VC_MANIFEST_BASENAME).auto.manifest
-
-!else
-
-_VC_MANIFEST_CLEAN=
-
-!endif
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "..\..\..\Build\Release\libiscpk11.dll"
-
-!ELSE
-
-ALL : "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\libiscpk11.dll"
-
-!ENDIF
-
-!IF "$(RECURSE)" == "1"
-CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN"
-!ELSE
-CLEAN :
-!ENDIF
- -@erase "$(INTDIR)\DLLMain.obj"
- -@erase "$(INTDIR)\pk11.obj"
- -@erase "$(INTDIR)\pk11_api.obj"
- -@erase "$(INTDIR)\vc60.idb"
- -@erase "$(INTDIR)\version.obj"
- -@erase "$(OUTDIR)\libiscpk11.exp"
- -@erase "$(OUTDIR)\libiscpk11.lib"
- -@erase "..\..\..\Build\Release\libiscpk11.dll"
- -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/iscpk11/win32" /I "../../../lib/iscpk11/win32/include" @LIBXML2_INC@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" @CRYPTO@ @USE_PKCS11@ @PK11_LIB_LOCATION@ /D "LIBISCPK11_EXPORTS" /Fp"$(INTDIR)\libiscpk11.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libiscpk11.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libiscpk11.pdb" @MACHINE@ /def:".\libiscpk11.def" /out:"../../../Build/Release/libiscpk11.dll" /implib:"$(OUTDIR)\libiscpk11.lib"
-DEF_FILE= \
- ".\libiscpk11.def"
-LINK32_OBJS= \
- "$(INTDIR)\DLLMain.obj" \
- "$(INTDIR)\pk11.obj" \
- "$(INTDIR)\pk11_api.obj" \
- "$(INTDIR)\version.obj" \
- "..\..\isc\win32\Release\libisc.lib"
-
-"..\..\..\Build\Release\libiscpk11.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
- $(_VC_MANIFEST_EMBED_DLL)
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0"
-
-ALL : "..\..\..\Build\Debug\libiscpk11.dll" "$(OUTDIR)\libiscpk11.bsc"
-
-!ELSE
-
-ALL : "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\libiscpk11.dll" "$(OUTDIR)\libiscpk11.bsc"
-
-!ENDIF
-
-!IF "$(RECURSE)" == "1"
-CLEAN :"libisc - @PLATFORM@ DebugCLEAN"
-!ELSE
-CLEAN :
-!ENDIF
- -@erase "$(INTDIR)\DLLMain.obj"
- -@erase "$(INTDIR)\DLLMain.sbr"
- -@erase "$(INTDIR)\pk11.obj"
- -@erase "$(INTDIR)\pk11.sbr"
- -@erase "$(INTDIR)\pk11_api.obj"
- -@erase "$(INTDIR)\pk11_api.sbr"
- -@erase "$(INTDIR)\vc60.idb"
- -@erase "$(INTDIR)\vc60.pdb"
- -@erase "$(INTDIR)\version.obj"
- -@erase "$(INTDIR)\version.sbr"
- -@erase "$(OUTDIR)\libiscpk11.bsc"
- -@erase "$(OUTDIR)\libiscpk11.exp"
- -@erase "$(OUTDIR)\libiscpk11.lib"
- -@erase "$(OUTDIR)\libiscpk11.pdb"
- -@erase "..\..\..\Build\Debug\libiscpk11.dll"
- -@erase "..\..\..\Build\Debug\libiscpk11.ilk"
- -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/iscpk11/win32" /I "../../../lib/iscpk11/win32/include" @LIBXML2_INC@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @CRYPTO@ @USE_PKCS11@ @PK11_LIB_LOCATION@ /D "LIBISCPK11_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libiscpk11.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libiscpk11.bsc"
-BSC32_SBRS= \
- "$(INTDIR)\DLLMain.sbr" \
- "$(INTDIR)\pk11.sbr" \
- "$(INTDIR)\pk11_api.sbr" \
- "$(INTDIR)\version.sbr"
-
-"$(OUTDIR)\libiscpk11.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
- $(BSC32) @<<
- $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libiscpk11.pdb" /debug @MACHINE@ /def:".\libiscpk11.def" /out:"../../../Build/Debug/libiscpk11.dll" /implib:"$(OUTDIR)\libiscpk11.lib" /pdbtype:sept
-DEF_FILE= \
- ".\libiscpk11.def"
-LINK32_OBJS= \
- "$(INTDIR)\DLLMain.obj" \
- "$(INTDIR)\pk11.obj" \
- "$(INTDIR)\pk11_api.obj" \
- "$(INTDIR)\version.obj" \
- "..\..\isc\win32\Debug\libisc.lib"
-
-"..\..\..\Build\Debug\libiscpk11.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
- $(_VC_MANIFEST_EMBED_DLL)
-
-!ENDIF
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("libiscpk11.dep")
-!INCLUDE "libiscpk11.dep"
-!ELSE
-!MESSAGE Warning: cannot find "libiscpk11.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release" || "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-SOURCE=.\DLLMain.c
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-
-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\DLLMain.obj" "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=..\pk11.c
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-
-"$(INTDIR)\pk11.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\pk11.obj" "$(INTDIR)\pk11.sbr" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\pk11_api.c
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-
-"$(INTDIR)\pk11_api.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\pk11_api.obj" "$(INTDIR)\pk11_api.sbr" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\version.c
-
-!IF "$(CFG)" == "libiscpk11 - @PLATFORM@ Release"
-
-
-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF "$(CFG)" == "libiscpk11 - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\version.obj" "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF
-
-!ENDIF
-
-####################################################
-# Commands to generate initial empty manifest file and the RC file
-# that references it, and for generating the .res file:
-
-$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
-
-$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
- type <<$@
-#include <winuser.h>
-1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
-<< KEEP
-
-$(_VC_MANIFEST_BASENAME).auto.manifest :
- type <<$@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-</assembly>
-<< KEEP
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
- <ItemGroup>\r
- <Filter Include="Resource Files">\r
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
- </Filter>\r
- <Filter Include="Library Header Files">\r
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
- </Filter>\r
- <Filter Include="Pkcs11 Header Files">\r
- <UniqueIdentifier>{1237add4-05ec-41e0-bd7d-a38581c3da42}</UniqueIdentifier>\r
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
- </Filter>\r
- <Filter Include="Win32 Header Files">\r
- <UniqueIdentifier>{e5eed450-93e9-4032-9d4e-b44047e87f9c}</UniqueIdentifier>\r
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
- </Filter>\r
- <Filter Include="Library Source Files">\r
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
- </Filter>\r
- <Filter Include="Win32 Source Files">\r
- <UniqueIdentifier>{cbb410e0-8d49-4706-a369-6f840a0b1af4}</UniqueIdentifier>\r
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
- </Filter>\r
- </ItemGroup>\r
- <ItemGroup>\r
- <ClInclude Include="..\include\iscpk11\constants.h">\r
- <Filter>Library Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\iscpk11\internal.h">\r
- <Filter>Library Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\iscpk11\pk11.h">\r
- <Filter>Library Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\iscpk11\version.h">\r
- <Filter>Library Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\pkcs11\pkcs11.h">\r
- <Filter>Pkcs11 Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\pkcs11\pkcs11f.h">\r
- <Filter>Pkcs11 Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="..\include\pkcs11\pkcs11t.h">\r
- <Filter>Pkcs11 Header Files</Filter>\r
- </ClInclude>\r
- <ClInclude Include="include\pkcs11\cryptoki.h">\r
- <Filter>Win32 Header Files</Filter>\r
- </ClInclude>\r
- </ItemGroup>\r
- <ItemGroup>\r
- <ClCompile Include="..\pk11.c">\r
- <Filter>Library Source Files</Filter>\r
- </ClCompile>\r
- <ClCompile Include="DLLMain.c">\r
- <Filter>Win32 Source Files</Filter>\r
- </ClCompile>\r
- <ClCompile Include="pk11_api.c">\r
- <Filter>Win32 Source Files</Filter>\r
- </ClCompile>\r
- <ClCompile Include="version.c">\r
- <Filter>Win32 Source Files</Filter>\r
- </ClCompile>\r
- </ItemGroup>\r
- <ItemGroup>\r
- <None Include="libiscpk11.def" />\r
- </ItemGroup>\r
-</Project>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
- <ItemGroup Label="ProjectConfigurations">\r
- <ProjectConfiguration Include="Debug|@PLATFORM@">\r
- <Configuration>Debug</Configuration>\r
- <Platform>@PLATFORM@</Platform>\r
- </ProjectConfiguration>\r
- <ProjectConfiguration Include="Release|@PLATFORM@">\r
- <Configuration>Release</Configuration>\r
- <Platform>@PLATFORM@</Platform>\r
- </ProjectConfiguration>\r
- </ItemGroup>\r
- <PropertyGroup Label="Globals">\r
- <ProjectGuid>{3B710654-DADD-4AF0-A91A-54A8C3666D23}</ProjectGuid>\r
- <Keyword>Win32Proj</Keyword>\r
- <RootNamespace>libiscpk11</RootNamespace>\r
- </PropertyGroup>\r
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
- <ConfigurationType>DynamicLibrary</ConfigurationType>\r
- <UseDebugLibraries>true</UseDebugLibraries>\r
- <CharacterSet>MultiByte</CharacterSet>\r
- </PropertyGroup>\r
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
- <ConfigurationType>DynamicLibrary</ConfigurationType>\r
- <UseDebugLibraries>false</UseDebugLibraries>\r
- <WholeProgramOptimization>true</WholeProgramOptimization>\r
- <CharacterSet>MultiByte</CharacterSet>\r
- </PropertyGroup>\r
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
- <ImportGroup Label="ExtensionSettings">\r
- </ImportGroup>\r
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
- </ImportGroup>\r
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
- </ImportGroup>\r
- <PropertyGroup Label="UserMacros" />\r
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
- <LinkIncremental>true</LinkIncremental>\r
- <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
- <IntDir>.\$(Configuration)\</IntDir>\r
- </PropertyGroup>\r
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
- <LinkIncremental>false</LinkIncremental>\r
- <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
- <IntDir>.\$(Configuration)\</IntDir>\r
- </PropertyGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
- <ClCompile>\r
- <PrecompiledHeader>\r
- </PrecompiledHeader>\r
- <WarningLevel>Level3</WarningLevel>\r
- <Optimization>Disabled</Optimization>\r
- <PreprocessorDefinitions>WIN32;@CRYPTO@@USE_PKCS11@@PK11_LIB_LOCATION@_DEBUG;_WINDOWS;_USRDLL;LIBISCPK11_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <FunctionLevelLinking>false</FunctionLevelLinking>\r
- <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
- <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
- <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
- <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <BrowseInformation>true</BrowseInformation>\r
- </ClCompile>\r
- <Link>\r
- <SubSystem>Console</SubSystem>\r
- <GenerateDebugInformation>true</GenerateDebugInformation>\r
- <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
- <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
- </Link>\r
- <PreBuildEvent>\r
- <Command>cd ..\..\..\win32utils\r
-\r
-if NOT Exist ..\Build mkdir ..\Build\r
-if NOT Exist ..\Build\Debug mkdir ..\Build\Debug\r
-\r
-cd ..\lib\isc\win32\r
-call mklib.bat Debug\r
-\r
-</Command>\r
- </PreBuildEvent>\r
- </ItemDefinitionGroup>\r
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
- <ClCompile>\r
- <WarningLevel>Level3</WarningLevel>\r
- <PrecompiledHeader>\r
- </PrecompiledHeader>\r
- <Optimization>MaxSpeed</Optimization>\r
- <FunctionLevelLinking>true</FunctionLevelLinking>\r
- <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
- <PreprocessorDefinitions>WIN32;@CRYPTO@@USE_PKCS11@@PK11_LIB_LOCATION@NDEBUG;_WINDOWS;_USRDLL;LIBISCPK11_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
- <StringPooling>true</StringPooling>\r
- <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
- <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
- <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
- <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
- <WholeProgramOptimization>false</WholeProgramOptimization>\r
- </ClCompile>\r
- <Link>\r
- <SubSystem>Console</SubSystem>\r
- <GenerateDebugInformation>false</GenerateDebugInformation>\r
- <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
- <OptimizeReferences>true</OptimizeReferences>\r
- <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
- <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
- <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
- <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
- <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
- </Link>\r
- <PreBuildEvent>\r
- <Command>cd ..\..\..\win32utils\r
-\r
-if NOT Exist ..\Build mkdir ..\Build\r
-if NOT Exist ..\Build\Release mkdir ..\Build\Release\r
-\r
-cd ..\lib\isc\win32\r
-call mklib.bat Release\r
-\r
-</Command>\r
- </PreBuildEvent>\r
- </ItemDefinitionGroup>\r
- <ItemGroup>\r
- <ClInclude Include="..\include\iscpk11\constants.h" />\r
- <ClInclude Include="..\include\iscpk11\internal.h" />\r
- <ClInclude Include="..\include\iscpk11\pk11.h" />\r
- <ClInclude Include="..\include\iscpk11\version.h" />\r
- <ClInclude Include="..\include\pkcs11\pkcs11.h" />\r
- <ClInclude Include="..\include\pkcs11\pkcs11f.h" />\r
- <ClInclude Include="..\include\pkcs11\pkcs11t.h" />\r
- <ClInclude Include="include\pkcs11\cryptoki.h" />\r
- </ItemGroup>\r
- <ItemGroup>\r
- <ClCompile Include="..\pk11.c" />\r
- <ClCompile Include="DLLMain.c" />\r
- <ClCompile Include="pk11_api.c" />\r
- <ClCompile Include="version.c" />\r
- </ItemGroup>\r
- <ItemGroup>\r
- <None Include="libiscpk11.def" />\r
- </ItemGroup>\r
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
- <ImportGroup Label="ExtensionTargets">\r
- </ImportGroup>\r
-</Project>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-</Project>
\ No newline at end of file
+++ /dev/null
-/*
- * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
-
-/*! \file */
-
-#include <versions.h>
-
-#include <iscpk11/version.h>
-
-LIBISCPK11_EXTERNAL_DATA const char pk11_version[] = VERSION;
-
-LIBISCPK11_EXTERNAL_DATA const unsigned int pk11_libinterface = LIBINTERFACE;
-LIBISCPK11_EXTERNAL_DATA const unsigned int pk11_librevision = LIBREVISION;
-LIBISCPK11_EXTERNAL_DATA const unsigned int pk11_libage = LIBAGE;
-
ISCLIBS = -lisc
ISCCFGLIBS = -lisccfg
IRSLIBS = -lirs
-ISCPK11LIBS = -liscpk11
-LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} ${ISCPK11LIBS} @LIBS@
+LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
SUBDIRS =
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include -I../dns/include \
- ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCPK11_INCLUDES} \
+ ${DNS_INCLUDES} ${ISC_INCLUDES} \
-I${top_srcdir}/lib/irs/include \
-I../../irs/include
ISCLIBS = ../isc/libisc.@A@
DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCPK11LIBS = ../iscpk11/libiscpk11.@A@
ISCCFGLIBS = ../isccfg/libisccfg.@A@
IRSLIBS = ../irs/libirs.@A@
ISCDEPLIBS = ../isc/libisc.@A@
DNSDEPLIBS = ../dns/libdns.@A@
-ISCPK11DEPLIBS = ../iscpk11/libiscpk11.@A@
ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@
IRSDEPLIBS = ../irs/libirs.@A@
-DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} ${ISCPK11LIBS}
+DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
-LIBS = ${DNSLIBS} ${ISCPK11LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
+LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
SUBDIRS =
<OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
<IntDir>.\$(Configuration)\</IntDir>\r
<CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets>\r
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
<LinkIncremental>false</LinkIncremental>\r
<OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
<IntDir>.\$(Configuration)\</IntDir>\r
<CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets>\r
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>\r
</PropertyGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
<ClCompile>\r
# latter case, because there are no machine-generated OS-specific
# headers.
-ISCPK11_INCLUDES = @BIND9_ISCPK11_BUILDINCLUDE@ \
- -I${top_srcdir}/lib/iscpk11/unix/include \
- -I${top_srcdir}/lib/iscpk11/include
-
ISC_INCLUDES = @BIND9_ISC_BUILDINCLUDE@ \
-I${top_srcdir}/lib/isc \
-I${top_srcdir}/lib/isc/include \
./lib/isc/include/isc/util.h C 1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012
./lib/isc/include/isc/version.h C 2001,2004,2005,2006,2007
./lib/isc/include/isc/xml.h C 2006,2007
+./lib/isc/include/pk11/Makefile.in MAKE 2014
+./lib/isc/include/pk11/constants.h C 2014
+./lib/isc/include/pk11/internal.h C 2014
+./lib/isc/include/pk11/pk11.h C 2014
+./lib/isc/include/pkcs11/Makefile.in MAKE 2014
+./lib/isc/include/pkcs11/pkcs11.h X 2014
+./lib/isc/include/pkcs11/pkcs11f.h X 2014
+./lib/isc/include/pkcs11/pkcs11t.h X 2014
./lib/isc/inet_aton.c C.PORTION 1996,1997,1998,1999,2000,2001,2004,2005,2007,2008,2012,2013,2014
./lib/isc/inet_ntop.c C 1996,1997,1998,1999,2000,2001,2004,2005,2007,2009
./lib/isc/inet_pton.c C 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014
./lib/isc/nothreads/thread.c C 2000,2001,2004,2007
./lib/isc/ondestroy.c C 2000,2001,2004,2005,2007
./lib/isc/parseint.c C 2001,2002,2003,2004,2005,2007,2012
+./lib/isc/pk11.c C 2014
./lib/isc/pool.c C 2013
./lib/isc/portset.c C 2008
./lib/isc/powerpc/Makefile.in MAKE 2007,2012
./lib/isc/unix/include/isc/strerror.h C 2001,2004,2005,2007,2008
./lib/isc/unix/include/isc/syslog.h C 1999,2000,2001,2004,2005,2007
./lib/isc/unix/include/isc/time.h C 1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014
+./lib/isc/unix/include/pkcs11/Makefile.in MAKE 2014
+./lib/isc/unix/include/pkcs11/cryptoki.h X 2014
./lib/isc/unix/interfaceiter.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2014
./lib/isc/unix/ipv6.c C 1999,2000,2001,2004,2005,2006,2007
./lib/isc/unix/keyboard.c C 2000,2001,2004,2007
./lib/isc/unix/net.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014
./lib/isc/unix/os.c C 2000,2001,2004,2005,2007
+./lib/isc/unix/pk11_api.c C 2014
./lib/isc/unix/resource.c C 2000,2001,2004,2007,2008,2009
./lib/isc/unix/socket.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
./lib/isc/unix/socket_p.h C 2000,2001,2004,2005,2007,2008,2009
./lib/isc/win32/include/isc/thread.h C 1998,1999,2000,2001,2004,2005,2007,2009,2013
./lib/isc/win32/include/isc/time.h C 1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014
./lib/isc/win32/include/isc/win32os.h C 2002,2004,2007,2009
+./lib/isc/win32/include/pkcs11/Makefile.in MAKE 2014
+./lib/isc/win32/include/pkcs11/cryptoki.h X 2014
./lib/isc/win32/interfaceiter.c C 1999,2000,2001,2004,2007,2008,2009,2013,2014
./lib/isc/win32/ipv6.c C 1999,2000,2001,2004,2007
./lib/isc/win32/keyboard.c C 2000,2001,2004,2007
./lib/isc/win32/ntpaths.c C 2001,2004,2007,2009
./lib/isc/win32/once.c C 1999,2000,2001,2004,2007
./lib/isc/win32/os.c C 2000,2001,2002,2004,2007,2013
+./lib/isc/win32/pk11_api.c C 2014
./lib/isc/win32/resource.c C 2000,2001,2004,2007,2008
./lib/isc/win32/socket.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
./lib/isc/win32/stdio.c C 2000,2001,2004,2007,2013
./lib/isccfg/win32/libisccfg.vcxproj.in X 2013,2014
./lib/isccfg/win32/libisccfg.vcxproj.user X 2013
./lib/isccfg/win32/version.c C 1998,1999,2000,2001,2004,2007
-./lib/iscpk11/Makefile.in MAKE 2014
-./lib/iscpk11/api X 2014
-./lib/iscpk11/include/Makefile.in MAKE 2014
-./lib/iscpk11/include/iscpk11/Makefile.in MAKE 2014
-./lib/iscpk11/include/iscpk11/constants.h C 2014
-./lib/iscpk11/include/iscpk11/internal.h C 2014
-./lib/iscpk11/include/iscpk11/pk11.h C 2014
-./lib/iscpk11/include/iscpk11/version.h C 2014
-./lib/iscpk11/include/pkcs11/Makefile.in MAKE 2014
-./lib/iscpk11/include/pkcs11/pkcs11.h X 2014
-./lib/iscpk11/include/pkcs11/pkcs11f.h X 2014
-./lib/iscpk11/include/pkcs11/pkcs11t.h X 2014
-./lib/iscpk11/pk11.c C 2014
-./lib/iscpk11/unix/Makefile.in MAKE 2014
-./lib/iscpk11/unix/include/Makefile.in MAKE 2014
-./lib/iscpk11/unix/include/pkcs11/Makefile.in MAKE 2014
-./lib/iscpk11/unix/include/pkcs11/cryptoki.h X 2014
-./lib/iscpk11/unix/pk11_api.c C 2014
-./lib/iscpk11/version.c C 2014
-./lib/iscpk11/win32/DLLMain.c C 2014
-./lib/iscpk11/win32/include/pkcs11/cryptoki.h X 2014
-./lib/iscpk11/win32/libiscpk11.def.in X 2014
-./lib/iscpk11/win32/libiscpk11.dsp.in X 2014
-./lib/iscpk11/win32/libiscpk11.dsw X 2014
-./lib/iscpk11/win32/libiscpk11.mak.in X 2014
-./lib/iscpk11/win32/libiscpk11.vcxproj.filters.in X 2014
-./lib/iscpk11/win32/libiscpk11.vcxproj.in X 2014
-./lib/iscpk11/win32/libiscpk11.vcxproj.user X 2014
-./lib/iscpk11/win32/pk11_api.c C 2014
-./lib/iscpk11/win32/version.c C 2014
./lib/lwres/Makefile.in MAKE 2000,2001,2004,2005,2007,2012
./lib/lwres/api X 2000,2001,2006,2008,2009,2010,2011,2012,2013,2014
./lib/lwres/assert_p.h C 2000,2001,2004,2005,2007,2011,2012
require 5.000;
use strict;
use File::Spec;
+use Cwd;
# files to configure
"..\\lib\\isc\\win32\\libisc.def",
"..\\lib\\isc\\win32\\libisc.dsp",
"..\\lib\\isc\\win32\\libisc.mak",
- "..\\lib\\isc\\win32\\mklib.bat",
"..\\lib\\isccc\\win32\\libisccc.dsp",
"..\\lib\\isccc\\win32\\libisccc.mak",
"..\\lib\\isccfg\\win32\\libisccfg.dsp",
"..\\lib\\isccfg\\win32\\libisccfg.mak",
- "..\\lib\\iscpk11\\win32\\libiscpk11.def",
- "..\\lib\\iscpk11\\win32\\libiscpk11.dsp",
- "..\\lib\\iscpk11\\win32\\libiscpk11.mak",
"..\\lib\\lwres\\win32\\liblwres.dsp",
"..\\lib\\lwres\\win32\\liblwres.mak",
"..\\lib\\tests\\win32\\libtests.dsp",
"..\\lib\\isccc\\win32\\libisccc.vcxproj.filters",
"..\\lib\\isccfg\\win32\\libisccfg.vcxproj",
"..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters",
- "..\\lib\\iscpk11\\win32\\libiscpk11.vcxproj",
- "..\\lib\\iscpk11\\win32\\libiscpk11.vcxproj.filters",
"..\\lib\\lwres\\win32\\liblwres.vcxproj",
"..\\lib\\lwres\\win32\\liblwres.vcxproj.filters",
"..\\lib\\tests\\win32\\libtests.vcxproj",
# Check environment
# infer vcredist when not given
-
if ($vcredist_path eq " --infer-- ") {
if ($verbose) {
print "trying to infer vcredist path from build environment\n";
}
- if ($ENV{"VCRedistPath"} ne "") {
- $vcredist_path = $ENV{"VCRedistPath"};
- } elsif ($ENV{"FrameworkSDKDir"} ne "") {
- if (($want_win32 eq "yes") &&
- (-f File::Spec->catfile($ENV{"FrameworkSDKDir"},
- "BootStrapper", "Packages",
- "vcredist_x86", "vcredist_x86.exe"))) {
- $vcredist_path = File::Spec->catfile($ENV{"FrameworkSDKDir"},
- "BootStrapper",
- "Packages",
- "vcredist_x86",
- "vcredist_x86.exe");
- } elsif (($want_x64 eq "yes") &&
- (-f File::Spec->catfile($ENV{"FrameworkSDKDir"},
- "BootStrapper", "Packages",
- "vcredist_x64",
- "vcredist_x64.exe"))) {
- $vcredist_path = File::Spec->catfile($ENV{"FrameworkSDKDir"},
- "BootStrapper",
- "Packages",
- "vcredist_x64",
- "vcredist_x64.exe");
- }
- } elsif ($ENV{"VCINSTALLDIR"} ne "") {
- if (($want_win32 eq "yes") &&
- (-f File::Spec->catfile($ENV{"VCINSTALLDIR"}, "redist",
- "1033", "vcredist_x86.exe"))) {
- $vcredist_path = File::Spec->catfile($ENV{"VCINSTALLDIR"},
- "redist", "1033",
- "vcredist_x86.exe");
- } elsif (($want_x64 eq "yes") &&
- (-f File::Spec->catfile($ENV{"VCINSTALLDIR"}, "redist",
- "1033", "vcredist_x64.exe"))) {
- $vcredist_path = File::Spec->catfile($ENV{"VCINSTALLDIR"},
- "redist", "1033",
- "vcredist_x64.exe");
- }
+
+ my @vcpaths = {};
+ push(@vcpaths, $ENV{"VCRedistPath"}) if ($ENV{"VCRedistPath"} ne "");
+ push(@vcpaths, File::Spec->catfile( cwd(), "..", ".." ));
+
+ if ($ENV{"FrameworkSDKDir"} ne "" && $want_win32 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"FrameworkSDKDir"},
+ "BootStrapper", "Packages",
+ "vcredist_x86"));
+ } elsif ($ENV{"FrameworkSDKDir"} ne "" && $want_x64 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"FrameworkSDKDir"},
+ "BootStrapper", "Packages",
+ "vcredist_x64"));
+ }
+
+ if ($ENV{"WindowsSDKDir"} ne "" && $want_win32 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir"},
+ "BootStrapper", "Packages",
+ "vcredist_x86"));
+ } elsif ($ENV{"WindowsSDKDir"} ne "" && $want_x64 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir"},
+ "BootStrapper", "Packages",
+ "vcredist_x64"));
+ }
+
+ if ($ENV{"WindowsSDKDir_old"} ne "" && $want_win32 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir_old"},
+ "BootStrapper", "Packages",
+ "vcredist_x86"));
+ } elsif ($ENV{"WindowsSDKDir_old"} ne "" && $want_x64 eq "yes") {
+ push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir_old"},
+ "BootStrapper", "Packages",
+ "vcredist_x64"));
+ }
+
+ if ($ENV{"VCINSTALLDIR"}) {
+ push(@vcpaths, File::Spec->catfile($ENV{"VCINSTALLDIR"},
+ "redist", "1033"));
+ }
+
+ my $rfile;
+ if ($want_win32 eq "yes") {
+ $rfile = "vcredist_x86.exe";
} else {
+ $rfile = "vcredist_x64.exe";
+ }
+
+ foreach (@vcpaths) {
+ my $vp = File::Spec->catfile($_, $rfile);
+ if (-f $vp) {
+ $vcredist_path = $vp;
+ last;
+ }
+ }
+
+ if ($vcredist_path eq " --infer-- ") {
die "with-vcredist is REQUIRED\n";
}
+
+ if ($verbose) {
+ print "found vcredist at " . $vcredist_path . "\n";
+ }
}
my $msc_ver = 0;
} elsif ($1 ~~ @substdefd) {
if (defined($configdefd{$1})) {
my $def = $configdefd{$1};
+ my $pre = "$`";
+ my $post = "$'";
$def =~ s/([\\ "])/\\$1/g;
- $line = qq($`/D "$def"$');
+ $line = qq($pre/D "$def"$post);
} else {
$line = "$`$'";
}
sub makeversion {
# List of directories with version files
- my @dirlist = ("iscpk11", "isc", "dns", "isccc",
- "isccfg", "lwres", "bind9");
+ my @dirlist = ("isc", "dns", "isccc", "isccfg", "lwres", "bind9");
my %LibMacros = (
"bind9" => "LIBBIND9_EXPORTS",
"dns" => "LIBDNS_EXPORTS",
"isc" => "LIBISC_EXPORTS",
"isccc" => "LIBISCCC_EXPORTS",
"isccfg" => "LIBISCCFG_EXPORTS",
- "iscpk11" => "LIBISCPK11_EXPORTS",
"lwres" => "LIBLWRES_EXPORTS");
my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
my %Versions;
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32\BINDInstall\BINDInstall.vcxproj", "{190CC424-E8CC-46F2-9013-3152D6905118}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
-@IF PKCS11\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
-@END PKCS11\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
{B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "..\lib\dns\win32\gen.vcxproj", "{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}"\r
EndProject\r
-@IF PKCS11\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiscpk11", "..\lib\iscpk11\win32\libiscpk11.vcxproj", "{3B710654-DADD-4AF0-A91A-54A8C3666D23}"\r
-EndProject\r
-@END PKCS11\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisc", "..\lib\isc\win32\libisc.vcxproj", "{3840E563-D180-4761-AA9C-E6155F02EAFF}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
-@IF PKCS11\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
-@END PKCS11\r
EndProjectSection\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccc", "..\lib\isccc\win32\libisccc.vcxproj", "{B556705F-1920-4400-878A-B259D3556047}"\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns", "..\lib\dns\win32\libdns.vcxproj", "{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
-@IF PKCS11\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
-@END PKCS11\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
EndProjectSection\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11keygen", "..\bin\pkcs11\win32\pk11keygen.vcxproj", "{5042D371-0402-4FA3-A52A-769708694422}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
EndProjectSection\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11list", "..\bin\pkcs11\win32\pk11list.vcxproj", "{C663B088-F7BC-4C8C-8D06-A76636EED651}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
EndProjectSection\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11destroy", "..\bin\pkcs11\win32\pk11destroy.vcxproj", "{5B3137E5-7E1F-49AA-8810-A09AA417D326}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
EndProjectSection\r
EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11tokens", "..\bin\pkcs11\win32\pk11tokens.vcxproj", "{403FD4B1-A4F9-4159-9013-5860E3A4417D}"\r
ProjectSection(ProjectDependencies) = postProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23} = {3B710654-DADD-4AF0-A91A-54A8C3666D23}\r
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
EndProjectSection\r
EndProject\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Debug|@BUILD_PLATFORM@.Build.0 = Debug|@BUILD_PLATFORM@\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Release|@BUILD_PLATFORM@.ActiveCfg = Release|@BUILD_PLATFORM@\r
{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Release|@BUILD_PLATFORM@.Build.0 = Release|@BUILD_PLATFORM@\r
-@IF PKCS11\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
- {3B710654-DADD-4AF0-A91A-54A8C3666D23}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
-@END PKCS11\r
{3840E563-D180-4761-AA9C-E6155F02EAFF}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
{3840E563-D180-4761-AA9C-E6155F02EAFF}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
{3840E563-D180-4761-AA9C-E6155F02EAFF}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
Copyright (C) 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
- BIND 9.10 for Win32 Source Build Instructions. 11-Jul-2013
+ BIND 9.10 for Win32 Source Build Instructions. 02-Feb-2014
-Building BIND 9.10 on Windows XP/Vista/7/8 or server 2003/2008/2008R2
-has the following prerequisites:
+Building BIND 9.10 on Windows has the following prerequisites:
1) You need to install Perl for Windows. ActivePerl
(http://www.activestate.com/) and Strawberry Perl
5) The BIND Installer (BINDInstall) includes a copy of the
redistributable runtime object vcredist_x86.exe (or vcredist_x64.exe),
which is included with Visual Studio and can be downloaded from
-Microsoft. This file must be in place prior to running the build
-setup script.
+Microsoft. This file must be in place prior to running Configure.
+
+6) BIND is known to run on the following versions of Windows:
+Windows XP (with Service Pack 2 or higher), Vista, 7, 8, Server 2003,
+Server 2008, Server 2008R2, and Server 2012.
Step 1: Download and build OpenSSL
if the build instructions in the INSTALL.W32 (or INSTALL.W64) file
have changed, in particular for the assembler options:
- cd openssl-1.0.1f
- perl Configure --prefix=c:/openssl enable-static-engine VC-WIN32
- ms\do_ms
- nmake /f ms\ntdll.mak
-
- For 64 bit build, replace VC-WIN32 by VC-WIN64A.
- The enable-static-engine is needed when an OpenSSL engine will be
- used, so with GOST support (configured by default) and/or PKCS #11
- support.
-
- If you wish to use PKCS #11 to control a cryptographic hardware
- service module, please see "PKCS #11 (Cryptoki) support" in chapter 4
- of the BIND 9 Administrator Reference Guide. You will need to apply
- the patch in bind9\bin\pkcs11\openssl-1.0.1f-patch (this can be done
- using the Cygwin 'patch' utility) and add --pk11-libname and
+ 32-bit builds:
+ (In an x86 Visual Studio Command Prompt window)
+ cd openssl-1.0.1f
+ perl Configure --prefix=c:\openssl enable-static-engine VC-WIN32
+ ms\do_ms
+ nmake /f ms\ntdll.mak
+
+ 64-bit builds:
+ (In an x64 Visual Studio Command Prompt window)
+ cd openssl-1.0.1f
+ perl Configure --prefix=c:\openssl64 enable-static-engine VC-WIN64A
+ ms\do_win64a
+ nmake /f ms\ntdll.mak
+
+ The "enable-static-engine" option is needed when an OpenSSL engine
+ will be used -- for example, when using the GOST signing algorithm or
+ OpenSSL-based PKCS#11 support.
+
+ If you wish to use OpenSSL-based PKCS#11 to control a cryptographic
+ hardware service module, please see "PKCS#11 (Cryptoki) support" in
+ chapter 4 of the BIND 9 Administrator Reference Guide. You will need to
+ apply the patch in bind9\bin\pkcs11\openssl-1.0.1f-patch (this can be
+ done using the Cygwin 'patch' utility) and add --pk11-libname and
--pk11-flavor to the Configure command above.
Step 2: Download and build LibXML2
Now build libxml2, and copy the resulting files into the include and lib
directories:
- cd libxml2-2.9.1\win32
- cscript configure.js compiler=msvc vcmanifest=yes static=yes \
- debug=no iconv=no
- nmake /f Makefile.msvc libxml
+ cd libxml2-2.9.1\win32
+ cscript configure.js compiler=msvc vcmanifest=yes static=yes \
+ debug=no iconv=no
+ nmake /f Makefile.msvc libxml
+
+Step 3: Download and build GeoIP
+
+ Geographic ("geoip") ACLs require libGeoIP. If you wish to build BIND 9
+ without support for this feature, skip to step 4.
+
+ The libGeoIP source code is available from:
-Step 3: Download and build optional external packages (GeoIP, readline)
+ https://github.com/maxmind/geoip-api-c/releases.
- 3a) GeoIP is required to use IP geolocation. If you wish to build
- BIND 9 without support for this feature, skip to step 3b. The URL is:
- http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.5.1.tar.gz
+ As of this writing, the current version of libGeoIP is 1.6.0. There
+ is a known bug in this and all prior versions which prevents it from
+ building a suitable DLL with thread support on Windows. You can apply
+ the patch file bind9/win32utils/GeoIP.diff to address the problem.
+ This patch has been submitted upstream, and will be included in
+ future versions of libGeoIP.
- The current (version 1.5.1) GeoIP does not build a suitable
- DLL with safe threading. The GeoIP.diff file:
- - fixes WIN32 building support
- - makes pread() safe in a multi-threaded system
- - changes the Makefile.vc to build a DLL in place of a static
- library (BTW this is required by the previous point)
+Step 4: Download and build Readline
- 3b) The readline library adds command-line editing in nslookup and
- nsupdate. If you wish to build BIND 9 without support for this feature,
- skip to step 4.
+ The readline library adds command-line editing in nslookup and nsupdate.
+ If you wish to build BIND 9 without support for this feature, skip to
+ step 5.
Because the original GNU source for the readline library has no WIN32
- support, it will be necessary to download a version of the static
- readline library source that is ready to be built by Visual Studio.
- One such version is available at:
- http://gpsim.sourceforge.net/gpsimWin32/packages/readline-5.2-20061112-src.zip
+ support, it will be necessary to download a version of the static
+ readline library source that is ready to be built by Visual Studio. One
+ such version is available at:
-Step 4: Make the redistributable runtime object available
+ http://gpsim.sourceforge.net/gpsimWin32/gpsimWin32.html#readline_lib
+
+Step 5: Make the redistributable runtime object available
Check that the Microsoft redistributable object (vcredist_x86.exe or
vcredist_x64.exe) is available to the build. The file may be placed
may be placed in \build\vcredist_x86.exe). Or, the path to the file
can be specified via the VCREDIST_PATH environment variable, or via
the "with-vcredist=PATH" option to the configuration script (see
- step 4).
+ step 4). If none of these options is used, Configure will attempt to
+ find the redistributable based on clues in the build environment.
-Step 5: Configuring the BIND build
+Step 6: Configuring the BIND build
From the command prompt, cd to the win32utils directory under
the BIND 9 root:
perl Configure clean
-Step 5: Building BIND
+Step 7: Building BIND
To build using 'nmake' or older versions of Visual Studio (e.g.
- VS 2005 and 2008), go to the legacy subdirectory:
+ VS 2005 or VS 2008), go to the legacy subdirectory:
cd legacy
- and follow the instructions in win32-build.txt. Note that
- only 32 bit builds are supported in this mode.
+ and follow the instructions in win32-build.txt.
+
+ Note: Only 32-bit builds are supported in this mode.
+
+ To build using the Visual Studio GUI in VS 2010 or VS 2012:
+ open the bind9.sln solution file; this will load the project
+ files for all of the BIND 9 libraries and applications. Select
+ "Build->Batch Build", click "Select All", then click "Build".
- To build using the Visual Studio GUI (VS 2010 and 2012): open the bind9.sln
- solution file; this will load the project files for all of the BIND 9
- libraries and applications. Select "Build->Batch Build", click "Select
- All", then click "Build".
+ To build using MSBuild in VS 2010 or VS 2012: call MSBuild on
+ the bind9.sln solution file:
- To build using MSBuild (VS 2010 and 2012): call MSBuild on the
- bind9.sln solution file:
+ msbuild /t:Build /p:Configuration=Release bind9.sln
+ msbuild /t:Build /p:Configuration=Debug bind9.sln
- msbuild /t:Build /p:Configuration=Release && \
- msbuild /t:Build /p:Configuration=Debug
+ Note: This mode does not support building for Windows XP.
-Step 6: Install
+Step 8: Install
Installation is accomplished by running the BINDInstall program. All
DLL's are copied to the system32 area and all applications (including
<li><a href="nsupdate.html">nsupdate</a>
<li><a href="pkcs11-keygen.html">pkcs11-keygen</a> |
<a href="pkcs11-list.html">pkcs11-list</a> |
- <a href="pkcs11-destroy.html">pkcs11-destroy</a>
+ <a href="pkcs11-destroy.html">pkcs11-destroy</a> |
+ <a href="pkcs11-tokens.html">pkcs11-destroy</a>
<li><a href="rndc.html">rndc</a> |
<a href="rndc.conf.html">rndc.conf</a> |
<a href="rndc-confgen.html">rndc-confgen</a>
{{{\r
}}}\r
\r
-###############################################################################\r
-@IF PKCS11\r
-\r
-Project: "libiscpk11"="..\lib\iscpk11\win32\libiscpk11.dsp" - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-@END PKCS11\r
###############################################################################\r
\r
Project: "libisc"="..\..\lib\isc\win32\libisc.dsp" - Package Owner=<4>\r
\r
Package=<4>\r
{{{\r
-@IF PKCS11\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
-@END PKCS11\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name libisc\r
End Project Dependency\r
-@IF PKCS11\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
-@END PKCS11\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name libisc\r
End Project Dependency\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name libisc\r
End Project Dependency\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name libisc\r
End Project Dependency\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
}}}\r
\r
###############################################################################\r
Begin Project Dependency\r
Project_Dep_Name libisc\r
End Project Dependency\r
- Begin Project Dependency\r
- Project_Dep_Name libiscpk11\r
- End Project Dependency\r
}}}\r
\r
@END PKCS11\r
cd ..\..\lib
-@IF PKCS11
-cd iscpk11\win32
-nmake /nologo -f libiscpk11.mak CFG="libiscpk11 - Win32 Release" NO_EXTERNAL_DEPS="1"
-cd ..\..
-@END PKCS11
-
cd isc\win32
nmake /nologo -f libisc.mak CFG="libisc - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1"
cd ..\..
mc bindevt.mc
cd ..\..\..\win32utils\legacy
-@IF PKCS11
-echo Build libisc.lib import library
-
-cd ..\..\lib\isc\win32
-call mklib.bat Release
-@END PKCS11
-
rem Done
-Copyright (C) 2004, 2005, 2008, 2009, 2012, 2013 Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004, 2005, 2008, 2009, 2012, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
Copyright (C) 2001, 2002 Internet Software Consortium.
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
-$Id$
+ *LEGACY* BIND 9.10 for Win32 Source Build Instructions. 04-Feb-2014
- *legacy* BIND 9.10 for Win32 Source Build Instructions. 24-June-2013
+Building BIND 9.10 on Windows using legacy compilers (up to Visual
+Studio 2008) has the following prerequisites:
-Building BIND 9.10 on Windows XP/Vista/7/8 or server 2003/2008/2008R2
-has the following prerequisites:
-
-1) Perl, 2) Visual C++ redistributable object, 3) OpenSSL, and optionally
-4) LibXML2 and 5) GeoIP. See ..\build.txt for more details on these
-prerequisites.
+1) Perl, 2) Visual C++ redistributable object, 3) OpenSSL, and
+optionally 4) LibXML2, 5) LibGeoIP, and 6) Readline.
+See ..\build.txt for more details on these prerequisites.
If you want to build using Visual C++ 6.0, you'll need some extra
files that are to be found in the Platform SDK (which you will need
further (untested as not yet available). It will NOT build or run on
Windows 95, Windows 98, etc., or Windows RT platforms.
-Step 5: Building BIND
+BUILDING BIND
From the command prompt cd to the win32utils\legacy directory under
the BIND9 root:
projects / thirdparty / bind9.git / commitdiff
