Fix opt_imax() call

[openssl.git] / crypto / seed / seed_cbc.c

diff --git a/crypto/seed/seed_cbc.c b/crypto/seed/seed_cbc.c
index 4f718ccb44e63f077ea0ee554c1bfcf17d042bc5..470116c5056ce348fc0fc4bda9f9e1c11e1993d0 100644 (file)
--- a/crypto/seed/seed_cbc.c
+++ b/crypto/seed/seed_cbc.c
@@ -1,4 +1,3 @@
-/* crypto/seed/seed_cbc.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
  * Copyright (c) 1998-2007 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,81 +48,17 @@
  *
  */
 
-#include "seed_locl.h"
-#include <string.h>
+#include <openssl/seed.h>
+#include <openssl/modes.h>
 
 void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
                       size_t len, const SEED_KEY_SCHEDULE *ks,
                       unsigned char ivec[SEED_BLOCK_SIZE], int enc)
-       {
-       size_t n;
-       unsigned char tmp[SEED_BLOCK_SIZE];
-       const unsigned char *iv = ivec;
-
-       if (enc)
-               {
-               while (len >= SEED_BLOCK_SIZE)
-                       {
-                       for (n = 0; n < SEED_BLOCK_SIZE; ++n)
-                               out[n] = in[n] ^ iv[n];
-                       SEED_encrypt(out, out, ks);
-                       iv = out;
-                       len -= SEED_BLOCK_SIZE;
-                       in  += SEED_BLOCK_SIZE;
-                       out += SEED_BLOCK_SIZE;
-                       }
-               if (len)
-                       {
-                       for (n = 0; n < len; ++n)
-                               out[n] = in[n] ^ iv[n];
-                       for (n = len; n < SEED_BLOCK_SIZE; ++n)
-                               out[n] = iv[n];
-                       SEED_encrypt(out, out, ks);
-                       iv = out;
-                       }
-               memcpy(ivec, iv, SEED_BLOCK_SIZE);
-               }
-       else if (in != out) /* decrypt */
-               {
-               while (len >= SEED_BLOCK_SIZE)
-                       {
-                       SEED_decrypt(in, out, ks);
-                       for (n = 0; n < SEED_BLOCK_SIZE; ++n)
-                               out[n] ^= iv[n];
-                       iv = in;
-                       len -= SEED_BLOCK_SIZE;
-                       in  += SEED_BLOCK_SIZE;
-                       out += SEED_BLOCK_SIZE;
-                       }
-               if (len)
-                       {
-                       SEED_decrypt(in, tmp, ks);
-                       for (n = 0; n < len; ++n)
-                               out[n] = tmp[n] ^ iv[n];
-                       iv = in;
-                       }
-               memcpy(ivec, iv, SEED_BLOCK_SIZE);
-               }
-       else /* decrypt, overlap */
-               {
-               while (len >= SEED_BLOCK_SIZE)
-                       {
-                       memcpy(tmp, in, SEED_BLOCK_SIZE);
-                       SEED_decrypt(in, out, ks);
-                       for (n = 0; n < SEED_BLOCK_SIZE; ++n)
-                               out[n] ^= ivec[n];
-                       memcpy(ivec, tmp, SEED_BLOCK_SIZE);
-                       len -= SEED_BLOCK_SIZE;
-                       in  += SEED_BLOCK_SIZE;
-                       out += SEED_BLOCK_SIZE;
-                       }
-               if (len)
-                       {
-                       memcpy(tmp, in, SEED_BLOCK_SIZE);
-                       SEED_decrypt(tmp, tmp, ks);
-                       for (n = 0; n < len; ++n)
-                               out[n] = tmp[n] ^ ivec[n];
-                       memcpy(ivec, tmp, SEED_BLOCK_SIZE);
-                       }
-               }
-       }
+{
+    if (enc)
+        CRYPTO_cbc128_encrypt(in, out, len, ks, ivec,
+                              (block128_f) SEED_encrypt);
+    else
+        CRYPTO_cbc128_decrypt(in, out, len, ks, ivec,
+                              (block128_f) SEED_decrypt);
+}