Delete name mangling of internal sha3 symbols

diff --git a/ChangeLog b/ChangeLog
index 707f7e16f0fd966b888c255c21e128dd179b7205..9f72e89d054c02b919a3ae4bbb850fdc901c0cf7 100644 (file)
--- 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 62ab7af0e5a4732c70874f539ba21bd282a874c4..87f4aa37538e724b82f34b93422f69df8afc1479 100644 (file)
--- 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 c5f133ee0d271b150029968115154eae55c9f1b4..534fd1b25bfc277ca0b228ced0c7e3c6b12d6876 100644 (file)
--- 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 83fd1eb9ab7827685fbc8236a1d6627123ce7bac..62860248c823bdf9330a93bbb244736bceff3a42 100644 (file)
--- 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 fd6a2e3522c87ea9d86d7a206ed1381eef4d9d0e..24ab37a3b082fb4a08ccc3b5246dfb0799f58d51 100644 (file)
--- 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 8054cb76114db92db5927a57672f5c60a3cb8ffa..9b01231aa2190203e8aec8b5febbf504de4cc48a 100644 (file)
--- 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 43a911f9de1c02dd0fdb5af710a88f86ccbb65b6..cd22041b969c897a8b8b6477b3333de9a4f9af9e 100644 (file)
--- 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;