Rename internal Camellia symbols

Symbols from the NTT Camellia sources, used in the builtin crypto
provider, could conflict with symbols from other libraries such as
OpenSSL's libcrypto.  Rename those like we rename the Gladman AES
symbols.

ticket: 7626
target_version: 1.11.3
tags: pullup

diff --git a/src/lib/crypto/builtin/camellia/camellia.h b/src/lib/crypto/builtin/camellia/camellia.h
index 1e59a2ecba471b0c3e9fdc8411f8104b3631f467..d8a53260ceb269f3bdfadcbf0fae275cace6cc1b 100644 (file)
--- a/src/lib/crypto/builtin/camellia/camellia.h
+++ b/src/lib/crypto/builtin/camellia/camellia.h
@@ -48,6 +48,18 @@ typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN];
 typedef uint32_t u32;
 typedef uint8_t u8;
 
+/* For the Kerberos 5 tree, hide the Camellia symbol names. */
+#define camellia_setup128      k5_camellia_setup128
+#define camellia_setup192      k5_camellia_setup192
+#define camellia_setup256      k5_camellia_setup256
+#define camellia_encrypt128    k5_camellia_encrypt128
+#define camellia_decrypt128    k5_camellia_decrypt128
+#define camellia_encrypt256    k5_camellia_encrypt256
+#define camellia_decrypt256    k5_camellia_decrypt256
+#define Camellia_Ekeygen       k5_Camellia_Ekeygen
+#define Camellia_EncryptBlock  k5_Camellia_EncryptBlock
+#define Camellia_DecryptBlock  k5_Camellia_DecryptBlock
+
 void camellia_setup128(const unsigned char *key, u32 *subkey);
 void camellia_setup192(const unsigned char *key, u32 *subkey);
 void camellia_setup256(const unsigned char *key, u32 *subkey);