Skip to content

Commit

Permalink
Rename internal Camellia symbols
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit 19c9cc8)

ticket: 7626
version_fixed: 1.11.3
status: resolved
  • Loading branch information
greghudson authored and tlyu committed May 15, 2013
1 parent 70fd4a2 commit 9989610
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/lib/crypto/builtin/camellia/camellia.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9989610

Please sign in to comment.