From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 23 Jul 2024 07:08:16 +0000 (+0900)
Subject: build: avoid multiple definition if mpn_cnd_add_n
X-Git-Tag: 3.8.7~11^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cc6ff55de55dccac0fef14b49afa0fc15240d09;p=thirdparty%2Fgnutls.git

build: avoid multiple definition if mpn_cnd_add_n

When Nettle is built with mini-gmp, mpn_cnd_add_n is always defined in
libhogweed and thus causes a symbol clash when linking with both
libgnutls and the latest libgmp.

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/lib/nettle/int/dsa-compute-k.c b/lib/nettle/int/dsa-compute-k.c
index 2fcb2bb80e..114af808e0 100644
--- a/lib/nettle/int/dsa-compute-k.c
+++ b/lib/nettle/int/dsa-compute-k.c
@@ -104,7 +104,7 @@ int _gnutls_dsa_compute_k(mp_limb_t *h, const mp_limb_t *q, const mp_limb_t *x,
 
 	cy = mpn_sub_n(h, h, q, qn);
 	/* Fall back to addmul_1, if nettle is linked with mini-gmp. */
-#ifdef mpn_cnd_add_n
+#if defined(mpn_cnd_add_n) && !NETTLE_USE_MINI_GMP
 	mpn_cnd_add_n(cy, h, h, q, qn);
 #else
 	mpn_addmul_1(h, q, qn, cy != 0);