unified build scheme: add build.info files

[openssl.git] / crypto / camellia / cmll_cbc.c

diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 545e6c1f41375c6d65dbc3275e3dcb146a5e54ff..742af6d679f055d0ff2322ac98254bcdcb587752 100644 (file)
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -1,4 +1,3 @@
-/* crypto/camellia/camellia_cbc.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -7,7 +6,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,95 +48,18 @@
  *
  */
 
-#ifndef CAMELLIA_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-#include <string.h>
-
 #include <openssl/camellia.h>
-#include "cmll_locl.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) 
-       {
+#include <openssl/modes.h>
 
-       unsigned long n;
-       unsigned long len = length;
-       unsigned char tmp[CAMELLIA_BLOCK_SIZE];
-       const unsigned char *iv = ivec;
-
-       assert(in && out && key && ivec);
-       assert((CAMELLIA_ENCRYPT == enc)||(CAMELLIA_DECRYPT == enc));
+void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                          size_t len, const CAMELLIA_KEY *key,
+                          unsigned char *ivec, const int enc)
+{
 
-       if (CAMELLIA_ENCRYPT == enc) 
-               {
-               while (len >= CAMELLIA_BLOCK_SIZE) 
-                       {
-                       for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
-                               out[n] = in[n] ^ iv[n];
-                       Camellia_encrypt(out, out, key);
-                       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];
-                       Camellia_encrypt(out, out, key);
-                       iv = out;
-                       }
-               memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-               } 
-       else if (in != out) 
-               {
-               while (len >= CAMELLIA_BLOCK_SIZE) 
-                       {
-                       Camellia_decrypt(in, out, key);
-                       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) 
-                       {
-                       Camellia_decrypt(in,tmp,key);
-                       for(n=0; n < len; ++n)
-                               out[n] = tmp[n] ^ iv[n];
-                       iv = in;
-                       }
-               memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
-               } 
-       else 
-               {
-               while (len >= CAMELLIA_BLOCK_SIZE) 
-                       {
-                       memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
-                       Camellia_decrypt(in, out, key);
-                       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);
-                       Camellia_decrypt(tmp, out, key);
-                       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);
+}