From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 30 Nov 2020 14:03:20 +0000 (+0100)
Subject: Delete name mangling of internal sha3 symbols
X-Git-Tag: nettle_3.7rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e053691063525b81fef0021666996cb5a2287582;p=thirdparty%2Fnettle.git

Delete name mangling of internal sha3 symbols
---

diff --git a/ChangeLog b/ChangeLog
index 707f7e16..9f72e89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	* gost28147-internal.h: Likewise.
 	* poly1305-internal.h: Likewise.
 	* salsa20-internal.h: Likewise.
+	* sha3-internal.h: Likewise.
 
 2020-11-26  Niels Möller  <nisse@lysator.liu.se>
 
diff --git a/sha3-224.c b/sha3-224.c
index 62ab7af0..87f4aa37 100644
--- a/sha3-224.c
+++ b/sha3-224.c
@@ -54,8 +54,9 @@ sha3_224_update (struct sha3_224_ctx *ctx,
 		 size_t length,
 		 const uint8_t *data)
 {
-  ctx->index = _sha3_update (&ctx->state, SHA3_224_BLOCK_SIZE, ctx->block,
-			     ctx->index, length, data);
+  ctx->index = _nettle_sha3_update (&ctx->state,
+				    SHA3_224_BLOCK_SIZE, ctx->block,
+				    ctx->index, length, data);
 }
 
 void
diff --git a/sha3-256.c b/sha3-256.c
index c5f133ee..534fd1b2 100644
--- a/sha3-256.c
+++ b/sha3-256.c
@@ -54,8 +54,9 @@ sha3_256_update (struct sha3_256_ctx *ctx,
 		 size_t length,
 		 const uint8_t *data)
 {
-  ctx->index = _sha3_update (&ctx->state, SHA3_256_BLOCK_SIZE, ctx->block,
-			     ctx->index, length, data);
+  ctx->index = _nettle_sha3_update (&ctx->state,
+				    SHA3_256_BLOCK_SIZE, ctx->block,
+				    ctx->index, length, data);
 }
 
 void
diff --git a/sha3-384.c b/sha3-384.c
index 83fd1eb9..62860248 100644
--- a/sha3-384.c
+++ b/sha3-384.c
@@ -54,8 +54,9 @@ sha3_384_update (struct sha3_384_ctx *ctx,
 		 size_t length,
 		 const uint8_t *data)
 {
-  ctx->index = _sha3_update (&ctx->state, SHA3_384_BLOCK_SIZE, ctx->block,
-			     ctx->index, length, data);
+  ctx->index = _nettle_sha3_update (&ctx->state,
+				    SHA3_384_BLOCK_SIZE, ctx->block,
+				    ctx->index, length, data);
 }
 
 void
diff --git a/sha3-512.c b/sha3-512.c
index fd6a2e35..24ab37a3 100644
--- a/sha3-512.c
+++ b/sha3-512.c
@@ -54,8 +54,9 @@ sha3_512_update (struct sha3_512_ctx *ctx,
 		 size_t length,
 		 const uint8_t *data)
 {
-  ctx->index = _sha3_update (&ctx->state, SHA3_512_BLOCK_SIZE, ctx->block,
-			     ctx->index, length, data);
+  ctx->index = _nettle_sha3_update (&ctx->state,
+				    SHA3_512_BLOCK_SIZE, ctx->block,
+				    ctx->index, length, data);
 }
 
 void
diff --git a/sha3-internal.h b/sha3-internal.h
index 8054cb76..9b01231a 100644
--- a/sha3-internal.h
+++ b/sha3-internal.h
@@ -36,28 +36,25 @@
 
 #include "nettle-types.h"
 
-#define _sha3_update _nettle_sha3_update
-#define _sha3_pad _nettle_sha3_pad
-
 #define SHA3_HASH_MAGIC 6
 #define SHA3_SHAKE_MAGIC 0x1f
 
 unsigned
-_sha3_update (struct sha3_state *state,
-	      unsigned block_size, uint8_t *block,
-	      unsigned pos,
-	      size_t length, const uint8_t *data);
+_nettle_sha3_update (struct sha3_state *state,
+		     unsigned block_size, uint8_t *block,
+		     unsigned pos,
+		     size_t length, const uint8_t *data);
 
 
 void
-_sha3_pad (struct sha3_state *state,
-	   unsigned block_size, uint8_t *block, unsigned pos, uint8_t magic);
+_nettle_sha3_pad (struct sha3_state *state,
+		  unsigned block_size, uint8_t *block, unsigned pos, uint8_t magic);
 
 #define _sha3_pad_hash(state, block_size, block, pos) \
-  _sha3_pad (state, block_size, block, pos, SHA3_HASH_MAGIC)
+  _nettle_sha3_pad (state, block_size, block, pos, SHA3_HASH_MAGIC)
 
 #define _sha3_pad_shake(state, block_size, block, pos) \
-  _sha3_pad (state, block_size, block, pos, SHA3_SHAKE_MAGIC)
+  _nettle_sha3_pad (state, block_size, block, pos, SHA3_SHAKE_MAGIC)
 
 
 #endif
diff --git a/sha3.c b/sha3.c
index 43a911f9..cd22041b 100644
--- a/sha3.c
+++ b/sha3.c
@@ -62,10 +62,10 @@ sha3_absorb (struct sha3_state *state, unsigned length, const uint8_t *data)
 }
 
 unsigned
-_sha3_update (struct sha3_state *state,
-	      unsigned block_size, uint8_t *block,
-	      unsigned pos,
-	      size_t length, const uint8_t *data)
+_nettle_sha3_update (struct sha3_state *state,
+		     unsigned block_size, uint8_t *block,
+		     unsigned pos,
+		     size_t length, const uint8_t *data)
 {
   if (pos > 0)
     {
@@ -91,8 +91,8 @@ _sha3_update (struct sha3_state *state,
 }
 
 void
-_sha3_pad (struct sha3_state *state,
-	   unsigned block_size, uint8_t *block, unsigned pos, uint8_t magic)
+_nettle_sha3_pad (struct sha3_state *state,
+		  unsigned block_size, uint8_t *block, unsigned pos, uint8_t magic)
 {
   assert (pos < block_size);
   block[pos++] = magic;