diff options
| author | Andy Polyakov <appro@openssl.org> | 2006-12-02 11:12:13 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2006-12-02 11:12:13 +0000 |
| commit | 9f8cfb1c62c31a3e94d6cbbbbe7d0afda2c7fe97 (patch) | |
| tree | 9958e9d29e6b1f6487fa4ec72d1d1b42cf65248b /crypto/camellia | |
| parent | c163b5f7a00eca3a7fd776456a0ff92bbc93f225 (diff) | |
Improve Camellia code readability.
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/cmll_cbc.c | 7 | ||||
| -rw-r--r-- | crypto/camellia/cmll_locl.h | 3 | ||||
| -rw-r--r-- | crypto/camellia/cmll_misc.c | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c index 2e96b00726..932c1d1be6 100644 --- a/crypto/camellia/cmll_cbc.c +++ b/crypto/camellia/cmll_cbc.c @@ -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, } } } - diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h index 32453462a2..2ac2e95435 100644 --- a/crypto/camellia/cmll_locl.h +++ b/crypto/camellia/cmll_locl.h @@ -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))) diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c index c9c26e248a..63c7fd63fc 100644 --- a/crypto/camellia/cmll_misc.c +++ b/crypto/camellia/cmll_misc.c @@ -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); |