diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-05-13 22:59:35 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-05-13 23:02:02 -0400 |
| commit | 19c9cc879c6fdc9420d3d9e9fb3affbb692668b9 (patch) | |
| tree | 1c14cc67f2f6ba420eeb0c14563588f1696c6478 /src/lib/crypto | |
| parent | cf1a0c411b2668c57c41e9c4efd15ba17b6b322c (diff) | |
| download | krb5-19c9cc879c6fdc9420d3d9e9fb3affbb692668b9.tar.gz krb5-19c9cc879c6fdc9420d3d9e9fb3affbb692668b9.tar.xz krb5-19c9cc879c6fdc9420d3d9e9fb3affbb692668b9.zip | |
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
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/builtin/camellia/camellia.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/crypto/builtin/camellia/camellia.h b/src/lib/crypto/builtin/camellia/camellia.h index 1e59a2ecba..d8a53260ce 100644 --- 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); |