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/cmll_cbc.c | |
| parent | c163b5f7a00eca3a7fd776456a0ff92bbc93f225 (diff) | |
Improve Camellia code readability.
Diffstat (limited to 'crypto/camellia/cmll_cbc.c')
| -rw-r--r-- | crypto/camellia/cmll_cbc.c | 7 |
1 files changed, 2 insertions, 5 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, } } } - |