diff --git a/CHANGES b/CHANGES index 6e9b33163b..691a484f0d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4842. [bug] Conditionally compile opensslecdsa_link.c to avoid + warnings about unused function. [RT #46790] + 4841. [bug] Address -fsanitize=undefined warnings. [RT #46786] 4840. [test] Add tests to cover fallback to using ZSK on inactive diff --git a/configure b/configure index 9d8acc35d3..d4c484dc0c 100755 --- a/configure +++ b/configure @@ -856,6 +856,8 @@ OPENSSLGOSTLINKSRCS OPENSSLGOSTLINKOBJS OPENSSLEDDSALINKSRCS OPENSSLEDDSALINKOBJS +OPENSSLECDSALINKSRCS +OPENSSLECDSALINKOBJS DST_OPENSSL_INC INSTALL_LIBRARY ISC_THREAD_DIR @@ -15971,10 +15973,12 @@ case "$use_openssl" in $as_echo "disabled because of native PKCS11" >&6; } DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" ;; @@ -15983,20 +15987,24 @@ $as_echo "disabled because of native PKCS11" >&6; } $as_echo "no" >&6; } DST_OPENSSL_INC="" CRYPTO="" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" ;; auto) DST_OPENSSL_INC="" CRYPTO="" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path @@ -16317,6 +16325,8 @@ fi case $have_ecdsa in yes) OPENSSL_ECDSA="yes" + OPENSSLECDSALINKOBJS='${OPENSSLECDSALINKOBJS}' + OPENSSLECDSALINKSRCS='${OPENSSLECDSALINKSRCS}' $as_echo "#define HAVE_OPENSSL_ECDSA 1" >>confdefs.h @@ -16617,6 +16627,8 @@ esac + + DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" diff --git a/configure.in b/configure.in index 3cfdb00a7a..ebdd468758 100644 --- a/configure.in +++ b/configure.in @@ -1585,10 +1585,12 @@ case "$use_openssl" in AC_MSG_RESULT(disabled because of native PKCS11) DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" ;; @@ -1596,20 +1598,24 @@ case "$use_openssl" in AC_MSG_RESULT(no) DST_OPENSSL_INC="" CRYPTO="" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" ;; auto) DST_OPENSSL_INC="" CRYPTO="" + OPENSSLECDSALINKOBJS="" + OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" - OPENSSLEDDSALINKSRS="" + OPENSSLEDDSALINKSRCS="" OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" + OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" AC_MSG_ERROR( @@ -1834,6 +1840,8 @@ int main() { case $have_ecdsa in yes) OPENSSL_ECDSA="yes" + OPENSSLECDSALINKOBJS='${OPENSSLECDSALINKOBJS}' + OPENSSLECDSALINKSRCS='${OPENSSLECDSALINKSRCS}' AC_DEFINE(HAVE_OPENSSL_ECDSA, 1, [Define if your OpenSSL version supports ECDSA.]) ;; @@ -2049,6 +2057,8 @@ esac # AC_SUBST(DST_OPENSSL_INC) +AC_SUBST(OPENSSLECDSALINKOBJS) +AC_SUBST(OPENSSLECDSALINKSRCS) AC_SUBST(OPENSSLEDDSALINKOBJS) AC_SUBST(OPENSSLEDDSALINKSRCS) AC_SUBST(OPENSSLGOSTLINKOBJS) diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 4539e39048..f7556f31e3 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -39,9 +39,10 @@ LIBS = @LIBS@ # Alphabetically OPENSSLGOSTLINKOBJS = opensslgost_link.@O@ +OPENSSLECDSALINKOBJS = opensslecdsa_link.@O@ OPENSSLEDDSALINKOBJS = openssleddsa_link.@O@ OPENSSLLINKOBJS = openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \ - opensslecdsa_link.@O@ @OPENSSLEDDSALINKOBJS@ \ + @OPENSSLECDSALINKOBJS@ @OPENSSLEDDSALINKOBJS@ \ @OPENSSLGOSTLINKOBJS@ opensslrsa_link.@O@ PKCS11LINKOBJS = pkcs11dh_link.@O@ pkcs11dsa_link.@O@ pkcs11rsa_link.@O@ \ @@ -82,9 +83,10 @@ OBJS= @DNSTAPOBJS@ ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} \ # Alphabetically OPENSSLGOSTLINKSRCS = opensslgost_link.c -OPENSSLEDDDSALINKSRCS = openssleddsa_link.c +OPENSSLECDSALINKSRCS = opensslecdsa_link.c +OPENSSLEDDSALINKSRCS = openssleddsa_link.c OPENSSLLINKSRCS = openssl_link.c openssldh_link.c openssldsa_link.c \ - opensslecdsa_link.c @OPENSSLEDDDSALINKSRCS@ \ + @OPENSSLECDSALINKSRCS@ @OPENSSLEDDSALINKSRCS@ \ @OPENSSLGOSTLINKSRCS@ opensslrsa_link.c PKCS11LINKSRCS = pkcs11dh_link.c pkcs11dsa_link.c pkcs11rsa_link.c \