diff options
| author | Ben Laurie <ben@openssl.org> | 2011-06-09 17:09:08 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2011-06-09 17:09:08 +0000 |
| commit | f851acbffff133159b3aa24968b6c6448e192766 (patch) | |
| tree | 8b09c891f2536dfaa4d656d6270b020ae7182adb /crypto/camellia | |
| parent | 78ef9b020522ee84e3a0b23cb870d7a964f110c7 (diff) | |
Fix warnings/errors(!).
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/cmll_locl.h | 5 | ||||
| -rw-r--r-- | crypto/camellia/cmll_utl.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h index 4a4d880d16..246b6ce1d8 100644 --- a/crypto/camellia/cmll_locl.h +++ b/crypto/camellia/cmll_locl.h @@ -71,7 +71,8 @@ typedef unsigned int u32; typedef unsigned char u8; -int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE keyTable); +int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, + KEY_TABLE_TYPE keyTable); void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], const KEY_TABLE_TYPE keyTable, u8 ciphertext[]); void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[], @@ -80,4 +81,6 @@ void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[], const KEY_TABLE_TYPE keyTable, u8 ciphertext[]); void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[], const KEY_TABLE_TYPE keyTable, u8 plaintext[]); +int private_Camellia_set_key(const unsigned char *userKey, const int bits, + CAMELLIA_KEY *key); #endif /* #ifndef HEADER_CAMELLIA_LOCL_H */ diff --git a/crypto/camellia/cmll_utl.c b/crypto/camellia/cmll_utl.c index 1a488a5557..7a35711ec1 100644 --- a/crypto/camellia/cmll_utl.c +++ b/crypto/camellia/cmll_utl.c @@ -54,8 +54,6 @@ #include <openssl/camellia.h> #include "cmll_locl.h" -const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT; - int Camellia_set_key(const unsigned char *userKey, const int bits, CAMELLIA_KEY *key) { |