summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-08 15:03:17 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-06-08 15:03:20 +0200
commit0081a51a3df7ec30da22402fe878be61790ab721 (patch)
tree2a7819be79063a24485004db3f9dbfd1baf32aeb
parent497eecfe2f02369669f86bb9d5aa0f1f5263f38a (diff)
downloadgnutls-0081a51a3df7ec30da22402fe878be61790ab721.tar.gz
nettle: use older GMP macros for mpz_mod_2exp and mpz_div_2exp
These ensure that compilation will succeed even when building with gmp-mini. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--lib/nettle/int/dsa-keygen-fips186.c2
-rw-r--r--lib/nettle/int/provable-prime.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/nettle/int/dsa-keygen-fips186.c b/lib/nettle/int/dsa-keygen-fips186.c
index 0fc78d9250..7328f7761e 100644
--- a/lib/nettle/int/dsa-keygen-fips186.c
+++ b/lib/nettle/int/dsa-keygen-fips186.c
@@ -155,7 +155,7 @@ _dsa_generate_dss_pq(struct dsa_params *params,
mpz_set_ui(r, 1);
mpz_mul_2exp(r, r, p_bits - 1);
- mpz_mod_2exp(tmp, tmp, p_bits - 1);
+ mpz_fdiv_r_2exp(tmp, tmp, p_bits - 1);
mpz_add(tmp, tmp, r);
/* Generate candidate prime p in [2^(bits-1), 2^bits] */
diff --git a/lib/nettle/int/provable-prime.c b/lib/nettle/int/provable-prime.c
index e4a4325dcb..23e75c1440 100644
--- a/lib/nettle/int/provable-prime.c
+++ b/lib/nettle/int/provable-prime.c
@@ -1191,7 +1191,7 @@ st_provable_prime(mpz_t p,
mpz_set_ui(r, 1);
mpz_mul_2exp(r, r, bits - 1); /* r = 2^(bits-1) */
- mpz_mod_2exp(tmp, tmp, bits - 1);
+ mpz_fdiv_r_2exp(tmp, tmp, bits - 1);
mpz_add(tmp, tmp, r); /* tmp = x */
/* Generate candidate prime c in [2^(bits-1), 2^bits] */
@@ -1212,7 +1212,7 @@ st_provable_prime(mpz_t p,
if (mpz_cmp(c, r) > 0) {
/* t = 2^(bits-1)/2c0 */
- mpz_div_2exp(r, r, 1); /* r = 2^(bits-1) */
+ mpz_fdiv_q_2exp(r, r, 1); /* r = 2^(bits-1) */
mpz_cdiv_q(t, r, dc0);
/* c = t* 2c0 + 1 */