X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Fcamellia%2Fcmll_cbc.c;h=a4907ca05f78c11e5bb89f9dca5e98499907a06f;hb=82e586a90b18fa91fb2756af4c36cc70ff097f6d;hp=932c1d1be626dbd34803ef55fe1e69f5513ebdd2;hpb=9f8cfb1c62c31a3e94d6cbbbbe7d0afda2c7fe97;p=openssl.git

diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 932c1d1be6..a4907ca05f 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -49,233 +49,18 @@
  *
  */
 
-#ifndef CAMELLIA_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 #include <openssl/camellia.h>
-#include "cmll_locl.h"
+#include <openssl/modes.h>
 
 void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-		     const unsigned long length, const CAMELLIA_KEY *key,
-		     unsigned char *ivec, const int enc) {
-
-	unsigned long n;
-	unsigned long len = length;
-	unsigned char tmp[CAMELLIA_BLOCK_SIZE];
-	const unsigned char *iv = ivec;
-	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));
+                          size_t len, const CAMELLIA_KEY *key,
+                          unsigned char *ivec, const int enc)
+{
 
-	if(((size_t)in|(size_t)out|(size_t)ivec) % sizeof(u32) == 0)
-		{
-		if (CAMELLIA_ENCRYPT == enc)
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				XOR4WORD2((u32 *)out,
-					(u32 *)in, (u32 *)iv);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				key->enc(key->rd_key, (u32 *)out);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				iv = out;
-				len -= CAMELLIA_BLOCK_SIZE;
-				in += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				for(n=0; n < len; ++n)
-					out[n] = in[n] ^ iv[n];
-				for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] = iv[n];
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				key->enc(key->rd_key, (u32 *)out);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				iv = out;
-				}
-			memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-			}
-		else if (in != out)
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				memcpy(out,in,CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				key->dec(key->rd_key,(u32 *)out);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				XOR4WORD((u32 *)out, (u32 *)iv);
-				iv = in;
-				len -= CAMELLIA_BLOCK_SIZE;
-				in  += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)tmp);
-				key->dec(key->rd_key, (u32 *)tmp);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)tmp);
-				for(n=0; n < len; ++n)
-					out[n] = tmp[n] ^ iv[n];
-				iv = in;
-				}
-			memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-			}
-		else /* in == out */
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				key->dec(key->rd_key, (u32 *)out);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				XOR4WORD((u32 *)out, (u32 *)ivec);
-				memcpy(ivec, tmp, CAMELLIA_BLOCK_SIZE);
-				len -= CAMELLIA_BLOCK_SIZE;
-				in += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				key->dec(key->rd_key,(u32 *)out);
-				if (camellia_endian.little)
-					SWAP4WORD((u32 *)out);
-				for(n=0; n < len; ++n)
-					out[n] ^= ivec[n];
-				for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] = tmp[n];
-				memcpy(ivec, tmp, CAMELLIA_BLOCK_SIZE);
-				}
-			}
-		}
-	else /* no aligned */
-		{
-		if (CAMELLIA_ENCRYPT == enc)
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] = in[n] ^ iv[n];
-				memcpy(t32, out, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				key->enc(key->rd_key, t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out, t32, CAMELLIA_BLOCK_SIZE);
-				iv = out;
-				len -= CAMELLIA_BLOCK_SIZE;
-				in += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				for(n=0; n < len; ++n)
-					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(t32);
-				key->enc(key->rd_key, t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out, t32, CAMELLIA_BLOCK_SIZE);
-				iv = out;
-				}
-			memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-			}
-		else if (in != out)
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				memcpy(t32,in,CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				key->dec(key->rd_key,t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out,t32,CAMELLIA_BLOCK_SIZE);
-				for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] ^= iv[n];
-				iv = in;
-				len -= CAMELLIA_BLOCK_SIZE;
-				in  += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				memcpy(t32, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				key->dec(key->rd_key, t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out, t32, CAMELLIA_BLOCK_SIZE);
-				for(n=0; n < len; ++n)
-					out[n] ^= iv[n];
-				iv = in;
-				}
-			memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-			}
-		else
-			{
-			while (len >= CAMELLIA_BLOCK_SIZE)
-				{
-				memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-				memcpy(t32, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				key->dec(key->rd_key, t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out, t32, CAMELLIA_BLOCK_SIZE);
-				for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] ^= ivec[n];
-				memcpy(ivec, tmp, CAMELLIA_BLOCK_SIZE);
-				len -= CAMELLIA_BLOCK_SIZE;
-				in += CAMELLIA_BLOCK_SIZE;
-				out += CAMELLIA_BLOCK_SIZE;
-				}
-			if (len)
-				{
-				memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-				memcpy(t32, in, CAMELLIA_BLOCK_SIZE);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				key->dec(key->rd_key,t32);
-				if (camellia_endian.little)
-					SWAP4WORD(t32);
-				memcpy(out, t32, CAMELLIA_BLOCK_SIZE);
-				for(n=0; n < len; ++n)
-					out[n] ^= ivec[n];
-				for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
-					out[n] = tmp[n];
-				memcpy(ivec, tmp, CAMELLIA_BLOCK_SIZE);
-				}
-			}
-		}
+    if (enc)
+        CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
+                              (block128_f) Camellia_encrypt);
+    else
+        CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
+                              (block128_f) Camellia_decrypt);
 }