Add loaded dynamic ENGINEs to list.

[oweals/openssl.git] / crypto / camellia / cmll_ctr.c

diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 332749ef76c9a711e2ae9e5c3d8fb513b91d71e5..014e621a34bc6ecdd7efc5079a660e5b408729b5 100644 (file)
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -49,69 +49,9 @@
  *
  */
 
-#ifndef CAMELLIA_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
 #include <openssl/camellia.h>
-#include "cmll_locl.h"
-
-/* NOTE: the IV/counter CTR mode is big-endian.  The rest of the Camellia code
- * is endian-neutral. */
-/* increment counter (128-bit int) by 1 */
-static void Camellia_ctr128_inc(unsigned char *counter) 
-       {
-       unsigned long c;
-
-       /* Grab bottom dword of counter and increment */
-       c = GETU32(counter + 12);
-       c++;    c &= 0xFFFFFFFF;
-       PUTU32(counter + 12, c);
-
-       /* if no overflow, we're done */
-       if (c)
-               return;
-
-       /* Grab 1st dword of counter and increment */
-       c = GETU32(counter +  8);
-       c++;    c &= 0xFFFFFFFF;
-       PUTU32(counter +  8, c);
-
-       /* if no overflow, we're done */
-       if (c)
-               return;
-
-       /* Grab 2nd dword of counter and increment */
-       c = GETU32(counter +  4);
-       c++;    c &= 0xFFFFFFFF;
-       PUTU32(counter +  4, c);
-
-       /* if no overflow, we're done */
-       if (c)
-               return;
+#include <openssl/modes.h>
 
-       /* Grab top dword of counter and increment */
-       c = GETU32(counter +  0);
-       c++;    c &= 0xFFFFFFFF;
-       PUTU32(counter +  0, c);
-       }
-
-/* The input encrypted as though 128bit counter mode is being
- * used.  The extra state information to record how much of the
- * 128bit block we have used is contained in *num, and the
- * encrypted counter is kept in ecount_buf.  Both *num and
- * ecount_buf must be initialised with zeros before the first
- * call to Camellia_ctr128_encrypt().
- *
- * This algorithm assumes that the counter is in the x lower bits
- * of the IV (ivec), and that the application has full control over
- * overflow and the rest of the IV.  This implementation takes NO
- * responsability for checking that the counter doesn't overflow
- * into the rest of the IV when incremented.
- */
 void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
        size_t length, const CAMELLIA_KEY *key,
        unsigned char ivec[CAMELLIA_BLOCK_SIZE],
@@ -119,24 +59,6 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
        unsigned int *num) 
        {
 
-       unsigned int n;
-
-       assert(in && out && key && counter && num);
-       assert(*num < CAMELLIA_BLOCK_SIZE);
-
-       n = *num;
-
-       while (length--) 
-               {
-               if (n == 0) 
-                       {
-                       Camellia_encrypt(ivec, ecount_buf, key);
-                       Camellia_ctr128_inc(ivec);
-                       }
-               *(out++) = *(in++) ^ ecount_buf[n];
-               n = (n+1) % CAMELLIA_BLOCK_SIZE;
-               }
-
-       *num=n;
+       CRYPTO_ctr128_encrypt(in,out,length,key,ivec,ecount_buf,num,(block128_f)Camellia_encrypt);
        }