diff options
| author | Andy Polyakov <appro@openssl.org> | 2006-12-02 10:56:45 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2006-12-02 10:56:45 +0000 |
| commit | c163b5f7a00eca3a7fd776456a0ff92bbc93f225 (patch) | |
| tree | 5f775bf1c6cfbf7a336349c01d156cf02ea96c8e /crypto/camellia | |
| parent | 20da8b8f90a0fb58e7e4d0862b8d57765e0f3672 (diff) | |
Fix bugs in Camellia CBC routine.
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/cmll_cbc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c index 22c6ebfb05..2e96b00726 100644 --- a/crypto/camellia/cmll_cbc.c +++ b/crypto/camellia/cmll_cbc.c @@ -199,11 +199,13 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, out[n] = in[n] ^ iv[n]; for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n) out[n] = iv[n]; + memcpy(t32, out, CAMELLIA_BLOCK_SIZE); if (camellia_endian.little) - SWAP4WORD((u32 *)out); - key->enc(key->rd_key, (u32 *)out); + SWAP4WORD(t32); + key->enc(key->rd_key, t32); if (camellia_endian.little) - SWAP4WORD((u32 *)out); + SWAP4WORD(t32); + memcpy(out, t32, CAMELLIA_BLOCK_SIZE); iv = out; } memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE); @@ -228,7 +230,6 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, } if (len) { - memcpy(tmp, in, CAMELLIA_BLOCK_SIZE); memcpy(t32, in, CAMELLIA_BLOCK_SIZE); if (camellia_endian.little) SWAP4WORD(t32); @@ -237,7 +238,7 @@ void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, SWAP4WORD(t32); memcpy(out, t32, CAMELLIA_BLOCK_SIZE); for(n=0; n < len; ++n) - out[n] = tmp[n] ^ iv[n]; + out[n] ^= iv[n]; iv = in; } memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE); |