Delete name mangling of internal Chacha symbols

1 files changed, 29 insertions, 41 deletions

diff --git a/chacha-internal.h b/chacha-internal.h
index 0f790459..d92a6779 100644
--- a/chacha-internal.h
+++ b/chacha-internal.h
@@ -39,68 +39,56 @@
 #include "nettle-types.h"
 #include "chacha.h"
 
-#define _chacha_core _nettle_chacha_core
-#define _chacha_2core _nettle_chacha_2core
-#define _chacha_2core32 _nettle_chacha_2core32
-#define _chacha_3core _nettle_chacha_3core
-#define _chacha_3core32 _nettle_chacha_3core32
-#define _chacha_crypt_1core _nettle_chacha_crypt_1core
-#define _chacha_crypt_2core _nettle_chacha_crypt_2core
-#define _chacha_crypt_3core _nettle_chacha_crypt_3core
-#define _chacha_crypt32_1core _nettle_chacha_crypt32_1core
-#define _chacha_crypt32_2core _nettle_chacha_crypt32_2core
-#define _chacha_crypt32_3core _nettle_chacha_crypt32_3core
-
 void
-_chacha_core(uint32_t *dst, const uint32_t *src, unsigned rounds);
+_nettle_chacha_core(uint32_t *dst, const uint32_t *src, unsigned rounds);
 
 /* Functions available only in some configurations */
 void
-_chacha_2core(uint32_t *dst, const uint32_t *src, unsigned rounds);
+_nettle_chacha_2core(uint32_t *dst, const uint32_t *src, unsigned rounds);
 
 void
-_chacha_2core32(uint32_t *dst, const uint32_t *src, unsigned rounds);
+_nettle_chacha_2core32(uint32_t *dst, const uint32_t *src, unsigned rounds);
 
 void
-_chacha_3core(uint32_t *dst, const uint32_t *src, unsigned rounds);
+_nettle_chacha_3core(uint32_t *dst, const uint32_t *src, unsigned rounds);
 
 void
-_chacha_3core32(uint32_t *dst, const uint32_t *src, unsigned rounds);
+_nettle_chacha_3core32(uint32_t *dst, const uint32_t *src, unsigned rounds);
 
 void
-_chacha_crypt_1core(struct chacha_ctx *ctx,
-		    size_t length,
-		    uint8_t *dst,
-		    const uint8_t *src);
+_nettle_chacha_crypt_1core(struct chacha_ctx *ctx,
+			   size_t length,
+			   uint8_t *dst,
+			   const uint8_t *src);
 
 void
-_chacha_crypt_2core(struct chacha_ctx *ctx,
-		    size_t length,
-		    uint8_t *dst,
-		    const uint8_t *src);
+_nettle_chacha_crypt_2core(struct chacha_ctx *ctx,
+			   size_t length,
+			   uint8_t *dst,
+			   const uint8_t *src);
 
 void
-_chacha_crypt_3core(struct chacha_ctx *ctx,
-		    size_t length,
-		    uint8_t *dst,
-		    const uint8_t *src);
+_nettle_chacha_crypt_3core(struct chacha_ctx *ctx,
+			   size_t length,
+			   uint8_t *dst,
+			   const uint8_t *src);
 
 void
-_chacha_crypt32_1core(struct chacha_ctx *ctx,
-		      size_t length,
-		      uint8_t *dst,
-		      const uint8_t *src);
+_nettle_chacha_crypt32_1core(struct chacha_ctx *ctx,
+			     size_t length,
+			     uint8_t *dst,
+			     const uint8_t *src);
 
 void
-_chacha_crypt32_2core(struct chacha_ctx *ctx,
-		      size_t length,
-		      uint8_t *dst,
-		      const uint8_t *src);
+_nettle_chacha_crypt32_2core(struct chacha_ctx *ctx,
+			     size_t length,
+			     uint8_t *dst,
+			     const uint8_t *src);
 
 void
-_chacha_crypt32_3core(struct chacha_ctx *ctx,
-		      size_t length,
-		      uint8_t *dst,
-		      const uint8_t *src);
+_nettle_chacha_crypt32_3core(struct chacha_ctx *ctx,
+			     size_t length,
+			     uint8_t *dst,
+			     const uint8_t *src);
 
 #endif /* NETTLE_CHACHA_INTERNAL_H_INCLUDED */