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

                        warnings about unused function. [RT #46790]

(cherry picked from commit 63459cdc)
(cherry picked from commit 2d82ed94)

CHANGES

+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

configure

@@ -844,6 +844,8 @@ OPENSSLGOSTLINKSRCS
 OPENSSLGOSTLINKOBJS
 OPENSSLEDDSALINKSRCS
 OPENSSLEDDSALINKOBJS
+OPENSSLECDSALINKSRCS
+OPENSSLECDSALINKOBJS
 DST_OPENSSL_INC
 USE_OPENSSL
 LWRES_PLATFORM_NEEDSYSSELECTH
@@ -13728,20 +13730,24 @@ case "$use_openssl" in
 $as_echo "no" >&6; }
 		DST_OPENSSL_INC=""
 		USE_OPENSSL=""
-		OPENSSLGOSTLINKOBJS=""
-		OPENSSLGOSTLINKSRS=""
+		OPENSSLECDSALINKOBJS=""
+		OPENSSLECDSALINKSRCS=""
 		OPENSSLEDDSALINKOBJS=""
-		OPENSSLEDDSALINKSRS=""
+		OPENSSLEDDSALINKSRCS=""
+		OPENSSLGOSTLINKOBJS=""
+		OPENSSLGOSTLINKSRCS=""
 		OPENSSLLINKOBJS=""
 		OPENSSLLINKSRCS=""
 		;;
 	auto)
 		DST_OPENSSL_INC=""
 		USE_OPENSSL=""
-		OPENSSLGOSTLINKOBJS=""
-		OPENSSLGOSTLINKSRS=""
+		OPENSSLECDSALINKOBJS=""
+		OPENSSLECDSALINKSRCS=""
 		OPENSSLEDDSALINKOBJS=""
-		OPENSSLEDDSALINKSRS=""
+		OPENSSLEDDSALINKSRCS=""
+		OPENSSLGOSTLINKOBJS=""
+		OPENSSLGOSTLINKSRCS=""
 		OPENSSLLINKOBJS=""
 		OPENSSLLINKSRCS=""
 		as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
@@ -14064,6 +14070,8 @@ fi
 	case $have_ecdsa in
 	yes)
 		OPENSSL_ECDSA="yes"
+		OPENSSLECDSALINKOBJS='${OPENSSLECDSALINKOBJS}'
+		OPENSSLECDSALINKSRCS='${OPENSSLECDSALINKSRCS}'
 
 $as_echo "#define HAVE_OPENSSL_ECDSA 1" >>confdefs.h
 
@@ -14252,6 +14260,8 @@ esac
 
 
 
+
+
 DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
 
 #

configure.in

@@ -758,20 +758,24 @@ case "$use_openssl" in
 		AC_MSG_RESULT(no)
 		DST_OPENSSL_INC=""
 		USE_OPENSSL=""
-		OPENSSLGOSTLINKOBJS=""
-		OPENSSLGOSTLINKSRS=""
+		OPENSSLECDSALINKOBJS=""
+		OPENSSLECDSALINKSRCS=""
 		OPENSSLEDDSALINKOBJS=""
-		OPENSSLEDDSALINKSRS=""
+		OPENSSLEDDSALINKSRCS=""
+		OPENSSLGOSTLINKOBJS=""
+		OPENSSLGOSTLINKSRCS=""
 		OPENSSLLINKOBJS=""
 		OPENSSLLINKSRCS=""
 		;;
 	auto)
 		DST_OPENSSL_INC=""
 		USE_OPENSSL=""
-		OPENSSLGOSTLINKOBJS=""
-		OPENSSLGOSTLINKSRS=""
+		OPENSSLECDSALINKOBJS=""
+		OPENSSLECDSALINKSRCS=""
 		OPENSSLEDDSALINKOBJS=""
-		OPENSSLEDDSALINKSRS=""
+		OPENSSLEDDSALINKSRCS=""
+		OPENSSLGOSTLINKOBJS=""
+		OPENSSLGOSTLINKSRCS=""
 		OPENSSLLINKOBJS=""
 		OPENSSLLINKSRCS=""
 		AC_MSG_ERROR(
@@ -993,6 +997,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.])
 		;;
@@ -1124,6 +1130,8 @@ esac
 
 AC_SUBST(USE_OPENSSL)
 AC_SUBST(DST_OPENSSL_INC)
+AC_SUBST(OPENSSLECDSALINKOBJS)
+AC_SUBST(OPENSSLECDSALINKSRCS)
 AC_SUBST(OPENSSLEDDSALINKOBJS)
 AC_SUBST(OPENSSLEDDSALINKSRCS)
 AC_SUBST(OPENSSLGOSTLINKOBJS)

lib/dns/Makefile.in

@@ -45,9 +45,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@
 
 DSTOBJS =	@DST_EXTRA_OBJS@ @OPENSSLLINKOBJS@ \
@@ -79,9 +80,10 @@ OBJS=		${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} @RRLLINKOBJS@
 
 # 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
 
 DSTSRCS =	@DST_EXTRA_SRCS@ @OPENSSLLINKSRCS@ \