GH715: Missed some null-check-removals.
[openssl.git] / crypto / camellia / cmll_cbc.c
index 2e96b007265eb51882dd185335200576e305b22f..742af6d679f055d0ff2322ac98254bcdcb587752 100644 (file)
@@ -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
  *
  */
 
-#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[UNITSIZE];
-       const union { long one; char little; } camellia_endian = {1};
-
+                          size_t len, const CAMELLIA_KEY *key,
+                          unsigned char *ivec, const int enc)
+{
 
-       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 (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);
 }
-