4842. [bug] Conditionally compile opensslecdsa_link.c to avoid

                        warnings about unused function. [RT #46790]

diff --git a/CHANGES b/CHANGES
index 2a0ebaa2de65d32fc9a37dcfcd391a8a5d5a6c7e..8a566fce0fe8cd33cae8c3a4e1a4bf957284afa1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4842.  [bug]           Conditionally compile opensslecdsa_link.c to avoid
+                       warnings about unused function. [RT #46790]
+
        --- 9.12.0rc1 released ---
 
 4841.  [bug]           Address -fsanitize=undefined warnings. [RT #46786]

diff --git a/configure b/configure
index b6997965b4f2ef6de3b1e092cfb7075ca32b4977..46c12989e7ac2a38beb79364da452077bc567d20 100755 (executable)
--- a/configure
+++ b/configure
@@ -831,6 +831,8 @@ OPENSSLGOSTLINKSRCS
 OPENSSLGOSTLINKOBJS
 OPENSSLEDDSALINKSRCS
 OPENSSLEDDSALINKOBJS
+OPENSSLECDSALINKSRCS
+OPENSSLECDSALINKOBJS
 DST_OPENSSL_INC
 INSTALL_LIBRARY
 ISC_THREAD_DIR
@@ -15957,10 +15959,12 @@ $as_echo "disabled because of native PKCS11" >&6; }
                DST_OPENSSL_INC=""
                CRYPTO="-DPKCS11CRYPTO"
                CRYPTOLIB="pkcs11"
+               OPENSSLECDSALINKOBJS=""
+               OPENSSLECDSALINKSRCS=""
                OPENSSLEDDSALINKOBJS=""
-               OPENSSLEDDSALINKSRS=""
+               OPENSSLEDDSALINKSRCS=""
                OPENSSLGOSTLINKOBJS=""
-               OPENSSLGOSTLINKSRS=""
+               OPENSSLGOSTLINKSRCS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
@@ -15970,10 +15974,12 @@ $as_echo "no" >&6; }
                DST_OPENSSL_INC=""
                CRYPTO=""
                CRYPTOLIB=""
+               OPENSSLECDSALINKOBJS=""
+               OPENSSLECDSALINKSRCS=""
                OPENSSLEDDSALINKOBJS=""
-               OPENSSLEDDSALINKSRS=""
+               OPENSSLEDDSALINKSRCS=""
                OPENSSLGOSTLINKOBJS=""
-               OPENSSLGOSTLINKSRS=""
+               OPENSSLGOSTLINKSRCS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
@@ -15981,10 +15987,12 @@ $as_echo "no" >&6; }
                DST_OPENSSL_INC=""
                CRYPTO=""
                CRYPTOLIB=""
+               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
@@ -16306,6 +16314,8 @@ fi
        case $have_ecdsa in
        yes)
                OPENSSL_ECDSA="yes"
+               OPENSSLECDSALINKOBJS='${OPENSSLECDSALINKOBJS}'
+               OPENSSLECDSALINKSRCS='${OPENSSLECDSALINKSRCS}'
 
 $as_echo "#define HAVE_OPENSSL_ECDSA 1" >>confdefs.h
 
@@ -16606,6 +16616,8 @@ esac
 
 
 
+
+
 ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
 if test "yes" = "$with_aes"
 then

diff --git a/configure.in b/configure.in
index 17d156b6d447817061e6180dce4741e43bfd58b7..b78d0bfd3eaf7bcc3e81647b86df86c1976b9709 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1584,10 +1584,12 @@ case "$use_openssl" in
                DST_OPENSSL_INC=""
                CRYPTO="-DPKCS11CRYPTO"
                CRYPTOLIB="pkcs11"
+               OPENSSLECDSALINKOBJS=""
+               OPENSSLECDSALINKSRCS=""
                OPENSSLEDDSALINKOBJS=""
-               OPENSSLEDDSALINKSRS=""
+               OPENSSLEDDSALINKSRCS=""
                OPENSSLGOSTLINKOBJS=""
-               OPENSSLGOSTLINKSRS=""
+               OPENSSLGOSTLINKSRCS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
@@ -1596,10 +1598,12 @@ case "$use_openssl" in
                DST_OPENSSL_INC=""
                CRYPTO=""
                CRYPTOLIB=""
+               OPENSSLECDSALINKOBJS=""
+               OPENSSLECDSALINKSRCS=""
                OPENSSLEDDSALINKOBJS=""
-               OPENSSLEDDSALINKSRS=""
+               OPENSSLEDDSALINKSRCS=""
                OPENSSLGOSTLINKOBJS=""
-               OPENSSLGOSTLINKSRS=""
+               OPENSSLGOSTLINKSRCS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
@@ -1607,10 +1611,12 @@ case "$use_openssl" in
                DST_OPENSSL_INC=""
                CRYPTO=""
                CRYPTOLIB=""
+               OPENSSLECDSALINKOBJS=""
+               OPENSSLECDSALINKSRCS=""
                OPENSSLEDDSALINKOBJS=""
-               OPENSSLEDDSALINKSRS=""
+               OPENSSLEDDSALINKSRCS=""
                OPENSSLGOSTLINKOBJS=""
-               OPENSSLGOSTLINKSRS=""
+               OPENSSLGOSTLINKSRCS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                AC_MSG_ERROR(
@@ -1836,6 +1842,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.])
                ;;
@@ -2051,6 +2059,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 479396bd146a34ceed4ef05b8ec071665a42b9a9..74c01839eff5c527523476cf51d544bfd4e05ac5 100644 (file)
--- 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@ \
@@ -83,9 +84,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 \