From 728cc3be42709b4e261f187726bcfdeca19c304d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 7 Dec 2017 13:26:21 +1100 Subject: [PATCH] 4842. [bug] Conditionally compile opensslecdsa_link.c to avoid warnings about unused function. [RT #46790] (cherry picked from commit 63459cdc05b20b9e7fc9256e825860725aab9633) (cherry picked from commit 2d82ed9456e72dc4373bea19d63411afe1c48962) --- CHANGES | 3 +++ configure | 24 ++++++++++++++++++------ configure.in | 22 ++++++++++++++++------ lib/dns/Makefile.in | 8 +++++--- 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/CHANGES b/CHANGES index 9ad0cb451c..5842b1388c 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 0fa91c662e..8547275ff9 100755 --- a/configure +++ b/configure @@ -846,6 +846,8 @@ OPENSSLGOSTLINKSRCS OPENSSLGOSTLINKOBJS OPENSSLEDDSALINKSRCS OPENSSLEDDSALINKOBJS +OPENSSLECDSALINKSRCS +OPENSSLECDSALINKOBJS DST_OPENSSL_INC HAVE_SIT ISC_PLATFORM_USESIT @@ -15947,10 +15949,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="" ;; @@ -15959,20 +15963,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 @@ -16293,6 +16301,8 @@ fi case $have_ecdsa in yes) OPENSSL_ECDSA="yes" + OPENSSLECDSALINKOBJS='${OPENSSLECDSALINKOBJS}' + OPENSSLECDSALINKSRCS='${OPENSSLECDSALINKSRCS}' $as_echo "#define HAVE_OPENSSL_ECDSA 1" >>confdefs.h @@ -16593,6 +16603,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 6d75a6e0ca..2bfc6984ee 100644 --- a/configure.in +++ b/configure.in @@ -1603,10 +1603,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="" ;; @@ -1614,20 +1616,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( @@ -1852,6 +1858,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.]) ;; @@ -2067,6 +2075,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 c33a64a01f..c6d9b7234d 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -48,9 +48,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@ \ @@ -89,9 +90,10 @@ OBJS= ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} ${PORTDNSOBJS} \ # 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 \