From 3246dd90dd26766485dc571b3e40f45da30ed746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 30 Nov 2020 13:04:11 +0100
Subject: [PATCH] Delete name mangling of internal _nettle_dsa_hash function
---
ChangeLog | 1 +
dsa-hash.c | 4 ++--
dsa-internal.h | 6 ++----
dsa-sign.c | 2 +-
dsa-verify.c | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index adfe5a57..ca9b9cac 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 1a2ff5c3..aab3c838 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 2cf114a8..ce57c72a 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 2c72f847..42a0a581 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 348afdc4..eb573fe3 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);
--
GitLab