Delete name mangling of internal AES symbols

13 files changed, 40 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index fbb15986..427ad879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-30  Niels Möller  <nisse@lysator.liu.se>
+
+	* aes-internal.h: Delete name mangling of internal symbols. Update
+	all internal references to use _nettle prefix.
+
 2020-11-26  Niels Möller  <nisse@lysator.liu.se>
 
 	Enable powerpc64 gcm code in fat builds. Based on patch
diff --git a/aes-decrypt.c b/aes-decrypt.c
index cb9b0cea..1c22bfbb 100644
--- a/aes-decrypt.c
+++ b/aes-decrypt.c
@@ -371,8 +371,8 @@ aes128_decrypt(const struct aes128_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES128_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
+  _nettle_aes_decrypt(_AES128_ROUNDS, ctx->keys, &_aes_decrypt_table,
+		      length, dst, src);
 }
 
 void
@@ -381,8 +381,8 @@ aes192_decrypt(const struct aes192_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES192_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
+  _nettle_aes_decrypt(_AES192_ROUNDS, ctx->keys, &_aes_decrypt_table,
+		      length, dst, src);
 }
 
 void
@@ -391,6 +391,6 @@ aes256_decrypt(const struct aes256_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES256_ROUNDS, ctx->keys, &_aes_decrypt_table,
-	       length, dst, src);
+  _nettle_aes_decrypt(_AES256_ROUNDS, ctx->keys, &_aes_decrypt_table,
+		      length, dst, src);
 }
diff --git a/aes-encrypt-table.c b/aes-encrypt-table.c
index 200de7c3..0c39e9f5 100644
--- a/aes-encrypt-table.c
+++ b/aes-encrypt-table.c
@@ -49,7 +49,7 @@
  * consistent with the row numbering. */
 
 const struct aes_table
-_aes_encrypt_table =
+_nettle_aes_encrypt_table =
   { /* sbox */
     {
       0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,
diff --git a/aes-encrypt.c b/aes-encrypt.c
index d1496e54..257fa402 100644
--- a/aes-encrypt.c
+++ b/aes-encrypt.c
@@ -69,8 +69,8 @@ aes128_encrypt(const struct aes128_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_encrypt(_AES128_ROUNDS, ctx->keys, &_aes_encrypt_table,
-	       length, dst, src);
+  _nettle_aes_encrypt(_AES128_ROUNDS, ctx->keys, &_nettle_aes_encrypt_table,
+		      length, dst, src);
 }
 
 void
@@ -79,8 +79,8 @@ aes192_encrypt(const struct aes192_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_encrypt(_AES192_ROUNDS, ctx->keys, &_aes_encrypt_table,
-	       length, dst, src);
+  _nettle_aes_encrypt(_AES192_ROUNDS, ctx->keys, &_nettle_aes_encrypt_table,
+		      length, dst, src);
 }
 
 void
@@ -89,6 +89,6 @@ aes256_encrypt(const struct aes256_ctx *ctx,
 	       const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_encrypt(_AES256_ROUNDS, ctx->keys, &_aes_encrypt_table,
-	       length, dst, src);
+  _nettle_aes_encrypt(_AES256_ROUNDS, ctx->keys, &_nettle_aes_encrypt_table,
+		      length, dst, src);
 }
diff --git a/aes-internal.h b/aes-internal.h
index 7001d126..04f61c8c 100644
--- a/aes-internal.h
+++ b/aes-internal.h
@@ -36,13 +36,6 @@
 
 #include "aes.h"
 
-/* Name mangling */
-#define _aes_set_key _nettle_aes_set_key
-#define _aes_invert _nettle_aes_invert
-#define _aes_encrypt _nettle_aes_encrypt
-#define _aes_decrypt _nettle_aes_decrypt
-#define _aes_encrypt_table _nettle_aes_encrypt_table
-
 /* Define to use only small tables. */
 #ifndef AES_SMALL
 # define AES_SMALL 0
@@ -61,23 +54,23 @@ struct aes_table
 };
 
 void
-_aes_set_key(unsigned nr, unsigned nk,
-	     uint32_t *subkeys, const uint8_t *key);
+_nettle_aes_set_key(unsigned nr, unsigned nk,
+		    uint32_t *subkeys, const uint8_t *key);
 
 void
-_aes_invert(unsigned rounds, uint32_t *dst, const uint32_t *src);
+_nettle_aes_invert(unsigned rounds, uint32_t *dst, const uint32_t *src);
 
 void
-_aes_encrypt(unsigned rounds, const uint32_t *keys,
-	     const struct aes_table *T,
-	     size_t length, uint8_t *dst,
-	     const uint8_t *src);
+_nettle_aes_encrypt(unsigned rounds, const uint32_t *keys,
+		    const struct aes_table *T,
+		    size_t length, uint8_t *dst,
+		    const uint8_t *src);
 
 void
-_aes_decrypt(unsigned rounds, const uint32_t *keys,
-	     const struct aes_table *T,
-	     size_t length, uint8_t *dst,
-	     const uint8_t *src);
+_nettle_aes_decrypt(unsigned rounds, const uint32_t *keys,
+		    const struct aes_table *T,
+		    size_t length, uint8_t *dst,
+		    const uint8_t *src);
 
 /* Macros */
 /* Get the byte with index 0, 1, 2 and 3 */
@@ -105,7 +98,7 @@ _aes_decrypt(unsigned rounds, const uint32_t *keys,
      
 /* Globally visible so that the same sbox table can be used by aes_set_encrypt_key */
 
-extern const struct aes_table _aes_encrypt_table;
-#define aes_sbox (_aes_encrypt_table.sbox)
+extern const struct aes_table _nettle_aes_encrypt_table;
+#define aes_sbox (_nettle_aes_encrypt_table.sbox)
 
 #endif /* NETTLE_AES_INTERNAL_H_INCLUDED */
diff --git a/aes-invert-internal.c b/aes-invert-internal.c
index ddcddbab..a2faefa4 100644
--- a/aes-invert-internal.c
+++ b/aes-invert-internal.c
@@ -132,7 +132,7 @@ static const uint32_t mtable[0x100] =
 do { uint32_t t_swap = (a); (a) = (b); (b) = t_swap; } while(0)
 
 void
-_aes_invert(unsigned rounds, uint32_t *dst, const uint32_t *src)
+_nettle_aes_invert(unsigned rounds, uint32_t *dst, const uint32_t *src)
 {
   unsigned i;
 
diff --git a/aes-set-key-internal.c b/aes-set-key-internal.c
index 88728d85..80accbf9 100644
--- a/aes-set-key-internal.c
+++ b/aes-set-key-internal.c
@@ -43,8 +43,8 @@
 #include "macros.h"
 
 void
-_aes_set_key(unsigned nr, unsigned nk,
-	     uint32_t *subkeys, const uint8_t *key)
+_nettle_aes_set_key(unsigned nr, unsigned nk,
+		    uint32_t *subkeys, const uint8_t *key)
 {
   static const uint8_t rcon[10] = {
     0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x1b,0x36,
diff --git a/aes128-set-decrypt-key.c b/aes128-set-decrypt-key.c
index db0b2590..d86d2b34 100644
--- a/aes128-set-decrypt-key.c
+++ b/aes128-set-decrypt-key.c
@@ -43,7 +43,7 @@
 void
 aes128_invert_key (struct aes128_ctx *dst, const struct aes128_ctx *src)
 {
-  _aes_invert (_AES128_ROUNDS, dst->keys, src->keys); 
+  _nettle_aes_invert (_AES128_ROUNDS, dst->keys, src->keys);
 }
 
 void
diff --git a/aes128-set-encrypt-key.c b/aes128-set-encrypt-key.c
index 870f2637..58f91857 100644
--- a/aes128-set-encrypt-key.c
+++ b/aes128-set-encrypt-key.c
@@ -40,5 +40,5 @@
 void
 aes128_set_encrypt_key(struct aes128_ctx *ctx, const uint8_t *key)
 {
-  _aes_set_key (_AES128_ROUNDS, AES128_KEY_SIZE / 4, ctx->keys, key);
+  _nettle_aes_set_key (_AES128_ROUNDS, AES128_KEY_SIZE / 4, ctx->keys, key);
 }
diff --git a/aes192-set-decrypt-key.c b/aes192-set-decrypt-key.c
index 8ce5ead9..ace7282c 100644
--- a/aes192-set-decrypt-key.c
+++ b/aes192-set-decrypt-key.c
@@ -41,7 +41,7 @@
 void
 aes192_invert_key (struct aes192_ctx *dst, const struct aes192_ctx *src)
 {
-  _aes_invert (_AES192_ROUNDS, dst->keys, src->keys); 
+  _nettle_aes_invert (_AES192_ROUNDS, dst->keys, src->keys);
 }
 
 void
diff --git a/aes192-set-encrypt-key.c b/aes192-set-encrypt-key.c
index 8faa6c85..5e9c4176 100644
--- a/aes192-set-encrypt-key.c
+++ b/aes192-set-encrypt-key.c
@@ -40,5 +40,5 @@
 void
 aes192_set_encrypt_key(struct aes192_ctx *ctx, const uint8_t *key)
 {
-  _aes_set_key (_AES192_ROUNDS, AES192_KEY_SIZE / 4, ctx->keys, key);
+  _nettle_aes_set_key (_AES192_ROUNDS, AES192_KEY_SIZE / 4, ctx->keys, key);
 }
diff --git a/aes256-set-decrypt-key.c b/aes256-set-decrypt-key.c
index 452794c4..884c21af 100644
--- a/aes256-set-decrypt-key.c
+++ b/aes256-set-decrypt-key.c
@@ -41,7 +41,7 @@
 void
 aes256_invert_key (struct aes256_ctx *dst, const struct aes256_ctx *src)
 {
-  _aes_invert (_AES256_ROUNDS, dst->keys, src->keys); 
+  _nettle_aes_invert (_AES256_ROUNDS, dst->keys, src->keys);
 }
 
 void
diff --git a/aes256-set-encrypt-key.c b/aes256-set-encrypt-key.c
index bbfb57ef..a3bd9743 100644
--- a/aes256-set-encrypt-key.c
+++ b/aes256-set-encrypt-key.c
@@ -40,5 +40,5 @@
 void
 aes256_set_encrypt_key(struct aes256_ctx *ctx, const uint8_t *key)
 {
-  _aes_set_key (_AES256_ROUNDS, AES256_KEY_SIZE / 4, ctx->keys, key);
+  _nettle_aes_set_key (_AES256_ROUNDS, AES256_KEY_SIZE / 4, ctx->keys, key);
 }