Commit f851acbf authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix warnings/errors(!).

parent 78ef9b02

crypto/camellia/cmll_locl.h

+4 −1
Original line number Diff line number Diff line
@@ -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 */

crypto/camellia/cmll_utl.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

	{