Commit 9f8cfb1c authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Improve Camellia code readability.

parent c163b5f7

crypto/camellia/cmll_cbc.c

+2 −5
Original line number Diff line number Diff line
@@ -69,16 +69,14 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, 
	unsigned long len = length;

	unsigned char tmp[CAMELLIA_BLOCK_SIZE];

	const unsigned char *iv = ivec;

	u32 t32[UNITSIZE];

	u32 t32[CAMELLIA_BLOCK_SIZE/sizeof(u32)];

	const union { long one; char little; } camellia_endian = {1};





	assert(in && out && key && ivec);

	assert((CAMELLIA_ENCRYPT == enc)||(CAMELLIA_DECRYPT == enc));



	if(((size_t)in) % ALIGN == 0

		&& ((size_t)out) % ALIGN == 0

		&& ((size_t)ivec) % ALIGN == 0)

	if(((size_t)in|(size_t)out|(size_t)ivec) % sizeof(u32) == 0)

		{

		if (CAMELLIA_ENCRYPT == enc)

			{
@@ -281,4 +279,3 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, 
			}

		}

}

crypto/camellia/cmll_locl.h

+0 −3
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ typedef unsigned int u32; 
extern "C" {

#endif



#define ALIGN 4

#define UNITSIZE 4



#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))

# define SWAP(x) ( _lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00 )

# define GETU32(p) SWAP(*((u32 *)(p)))

crypto/camellia/cmll_misc.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int Camellia_set_key(const unsigned char *userKey, const int bits, 
void Camellia_encrypt(const unsigned char *in, unsigned char *out,

	const CAMELLIA_KEY *key)

	{

	u32 tmp[UNITSIZE];

	u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];

	const union { long one; char little; } camellia_endian = {1};



	memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
@@ -104,7 +104,7 @@ void Camellia_encrypt(const unsigned char *in, unsigned char *out, 
void Camellia_decrypt(const unsigned char *in, unsigned char *out,

	const CAMELLIA_KEY *key)

	{

	u32 tmp[UNITSIZE];

	u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];

	const union { long one; char little; } camellia_endian = {1};



	memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);