mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

Remove PKCS#11 DH implementation as there's no private keys stored in HSM for DH algorithm

Browse Source
This commit is contained in:
Ondřej Surý
2018-07-03 19:35:36 +02:00
parent 45abf438f8
commit 0a73c9f137
7 changed files with 2 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/Makefile.in
View File

@@ -46,7 +46,7 @@ DSTOBJS = @DST_EXTRA_OBJS@ \
gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ \ gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ \
openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \ openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
opensslecdsa_link.@O@ openssleddsa_link.@O@ opensslrsa_link.@O@ \ opensslecdsa_link.@O@ openssleddsa_link.@O@ opensslrsa_link.@O@ \
pkcs11dh_link.@O@ pkcs11dsa_link.@O@ pkcs11rsa_link.@O@ \ pkcs11dsa_link.@O@ pkcs11rsa_link.@O@ \
pkcs11ecdsa_link.@O@ pkcs11eddsa_link.@O@ pkcs11.@O@ \ pkcs11ecdsa_link.@O@ pkcs11eddsa_link.@O@ pkcs11.@O@ \
key.@O@ key.@O@
@@ -84,7 +84,7 @@ DSTSRCS = @DST_EXTRA_SRCS@ @PKCS11LINKSRCS@ \
dst_result.c gssapi_link.c gssapictx.c hmac_link.c \ dst_result.c gssapi_link.c gssapictx.c hmac_link.c \
openssl_link.c openssldh_link.c openssldsa_link.c \ openssl_link.c openssldh_link.c openssldsa_link.c \
opensslecdsa_link.c openssleddsa_link.c opensslrsa_link.c \ opensslecdsa_link.c openssleddsa_link.c opensslrsa_link.c \
pkcs11dh_link.c pkcs11dsa_link.c pkcs11rsa_link.c \ pkcs11dsa_link.c pkcs11rsa_link.c \
pkcs11ecdsa_link.c pkcs11eddsa_link.c pkcs11.c \ pkcs11ecdsa_link.c pkcs11eddsa_link.c pkcs11.c \
key.c key.c

1
lib/dns/dst_api.c
View File

@@ -209,7 +209,6 @@ dst_lib_init(isc_mem_t *mctx, const char *engine) {
RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA512])); RETERR(dst__pkcs11rsa_init(&dst_t_func[DST_ALG_RSASHA512]));
RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_DSA])); RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_DSA]));
RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_NSEC3DSA])); RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_NSEC3DSA]));
RETERR(dst__pkcs11dh_init(&dst_t_func[DST_ALG_DH]));
#if HAVE_PKCS11_ECDSA #if HAVE_PKCS11_ECDSA
RETERR(dst__pkcs11ecdsa_init(&dst_t_func[DST_ALG_ECDSA256])); RETERR(dst__pkcs11ecdsa_init(&dst_t_func[DST_ALG_ECDSA256]));
RETERR(dst__pkcs11ecdsa_init(&dst_t_func[DST_ALG_ECDSA384])); RETERR(dst__pkcs11ecdsa_init(&dst_t_func[DST_ALG_ECDSA384]));

1
lib/dns/dst_internal.h
View File

@@ -234,7 +234,6 @@ isc_result_t dst__openssleddsa_init(struct dst_func **funcp);
#if USE_PKCS11 #if USE_PKCS11
isc_result_t dst__pkcs11rsa_init(struct dst_func **funcp); isc_result_t dst__pkcs11rsa_init(struct dst_func **funcp);
isc_result_t dst__pkcs11dsa_init(struct dst_func **funcp); isc_result_t dst__pkcs11dsa_init(struct dst_func **funcp);
isc_result_t dst__pkcs11dh_init(struct dst_func **funcp);
#ifdef HAVE_PKCS11_ECDSA #ifdef HAVE_PKCS11_ECDSA
isc_result_t dst__pkcs11ecdsa_init(struct dst_func **funcp); isc_result_t dst__pkcs11ecdsa_init(struct dst_func **funcp);
#endif #endif

1127
lib/dns/pkcs11dh_link.c
View File

File diff suppressed because it is too large Load Diff

3
lib/dns/win32/libdns.vcxproj.filters.in
View File

@@ -323,9 +323,6 @@
<ClCompile Include="..\pkcs11.c"> <ClCompile Include="..\pkcs11.c">
<Filter>Dst Source Files</Filter> <Filter>Dst Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\pkcs11dh_link.c">
<Filter>Dst Source Files</Filter>
</ClCompile>
<ClCompile Include="..\pkcs11dsa_link.c"> <ClCompile Include="..\pkcs11dsa_link.c">
<Filter>Dst Source Files</Filter> <Filter>Dst Source Files</Filter>
</ClCompile> </ClCompile>

1
lib/dns/win32/libdns.vcxproj.in
View File

@@ -172,7 +172,6 @@
<ClCompile Include="..\peer.c" /> <ClCompile Include="..\peer.c" />
@IF PKCS11 @IF PKCS11
<ClCompile Include="..\pkcs11.c" /> <ClCompile Include="..\pkcs11.c" />
<ClCompile Include="..\pkcs11dh_link.c" />
<ClCompile Include="..\pkcs11dsa_link.c" /> <ClCompile Include="..\pkcs11dsa_link.c" />
<ClCompile Include="..\pkcs11ecdsa_link.c" /> <ClCompile Include="..\pkcs11ecdsa_link.c" />
<ClCompile Include="..\pkcs11eddsa_link.c" /> <ClCompile Include="..\pkcs11eddsa_link.c" />

1
util/copyrights
View File

@@ -3074,7 +3074,6 @@
./lib/dns/order.c C 2002,2004,2005,2007,2015,2016,2017,2018 ./lib/dns/order.c C 2002,2004,2005,2007,2015,2016,2017,2018
./lib/dns/peer.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/peer.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
./lib/dns/pkcs11.c C 2014,2016,2017,2018 ./lib/dns/pkcs11.c C 2014,2016,2017,2018
./lib/dns/pkcs11dh_link.c C 2014,2015,2016,2017,2018
./lib/dns/pkcs11dsa_link.c C 2014,2015,2016,2017,2018 ./lib/dns/pkcs11dsa_link.c C 2014,2015,2016,2017,2018
./lib/dns/pkcs11ecdsa_link.c C 2014,2015,2016,2017,2018 ./lib/dns/pkcs11ecdsa_link.c C 2014,2015,2016,2017,2018
./lib/dns/pkcs11eddsa_link.c C 2017,2018 ./lib/dns/pkcs11eddsa_link.c C 2017,2018