diff --git a/ChangeLog b/ChangeLog index adfe5a572e5daac0da0a1ab8281a85e45b0f6828..ca9b9cacf6959b1cbed25645b9c5f108b75034cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * aes-internal.h: Delete name mangling of internal symbols. Update all internal references to use _nettle prefix. * camellia-internal.h: Likewise. + * dsa-internal.h: Likewise. 2020-11-26 Niels Möller <nisse@lysator.liu.se> diff --git a/dsa-hash.c b/dsa-hash.c index 1a2ff5c3dd99e3eaff5b1faafe5ab7bcec80f337..aab3c838c60c236fbc386a19a87f7d3f92f50c91 100644 --- a/dsa-hash.c +++ b/dsa-hash.c @@ -42,8 +42,8 @@ FIPS186-3 allows both larger and smaller q; in the the latter case, the hash must be truncated to the right number of bits. */ void -_dsa_hash (mpz_t h, unsigned bit_size, - size_t length, const uint8_t *digest) +_nettle_dsa_hash (mpz_t h, unsigned bit_size, + size_t length, const uint8_t *digest) { if (length > (bit_size + 7) / 8) diff --git a/dsa-internal.h b/dsa-internal.h index 2cf114a81fbede7e18ab479f23a487911952bbe9..ce57c72a3c44d6014980b8cb901ee4e82b53ab38 100644 --- a/dsa-internal.h +++ b/dsa-internal.h @@ -36,12 +36,10 @@ #include "nettle-types.h" -#define _dsa_hash _nettle_dsa_hash - /* Internal functions. */ void -_dsa_hash (mpz_t h, unsigned bit_size, - size_t length, const uint8_t *digest); +_nettle_dsa_hash (mpz_t h, unsigned bit_size, + size_t length, const uint8_t *digest); #endif /* NETTLE_DSA_INTERNAL_H_INCLUDED */ diff --git a/dsa-sign.c b/dsa-sign.c index 2c72f84756affe94e2970f5c24c9c988a31663ad..42a0a581150daa129057a3ecd29661d9969de2c4 100644 --- a/dsa-sign.c +++ b/dsa-sign.c @@ -76,7 +76,7 @@ dsa_sign(const struct dsa_params *params, /* Compute hash */ mpz_init(h); - _dsa_hash (h, mpz_sizeinbase(params->q, 2), digest_size, digest); + _nettle_dsa_hash (h, mpz_sizeinbase(params->q, 2), digest_size, digest); /* Compute k^-1 (mod q) */ if (mpz_invert(k, k, params->q)) diff --git a/dsa-verify.c b/dsa-verify.c index 348afdc49d445034ce717ccf3babf01ffb2a91e0..eb573fe351513415d453dffe3d83c362645b6c69 100644 --- a/dsa-verify.c +++ b/dsa-verify.c @@ -78,7 +78,7 @@ dsa_verify(const struct dsa_params *params, mpz_init(v); /* The message digest */ - _dsa_hash (tmp, mpz_sizeinbase (params->q, 2), digest_size, digest); + _nettle_dsa_hash (tmp, mpz_sizeinbase (params->q, 2), digest_size, digest); /* v = g^{w * h (mod q)} (mod p) */ mpz_mul(tmp, tmp, w);