Convert CAST cipher to use 64-bit modes helper functions.

Signed-off-by: Dmitry Baryshkov <dbarysh...@gmail.com>
---
 src/lib/libcrypto/Makefile        |   2 +-
 src/lib/libcrypto/cast/c_cbc.c    |  75 +++++++++++++++++++++
 src/lib/libcrypto/cast/c_cfb64.c  |  56 ++--------------
 src/lib/libcrypto/cast/c_enc.c    | 108 ++++++++----------------------
 src/lib/libcrypto/cast/c_ofb64.c  |  46 ++-----------
 src/lib/libcrypto/cast/cast_lcl.h |   8 +++
 6 files changed, 120 insertions(+), 175 deletions(-)
 create mode 100644 src/lib/libcrypto/cast/c_cbc.c

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 291af21965bf..2e20904ab840 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -89,7 +89,7 @@ SRCS+= buffer.c buf_err.c buf_str.c
 SRCS+= cmll_cfb.c cmll_ctr.c cmll_ecb.c cmll_ofb.c
 
 # cast/
-SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c c_cbc.c
 
 # chacha/
 SRCS+= chacha.c
diff --git a/src/lib/libcrypto/cast/c_cbc.c b/src/lib/libcrypto/cast/c_cbc.c
new file mode 100644
index 000000000000..1dc32ad8ca54
--- /dev/null
+++ b/src/lib/libcrypto/cast/c_cbc.c
@@ -0,0 +1,75 @@
+/* $OpenBSD: c_cbc.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
+/* Copyright (C) 1995-1998 Eric Young (e...@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (e...@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (t...@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    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 the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (e...@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an 
acknowledgement:
+ *    "This product includes software written by Tim Hudson 
(t...@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <openssl/cast.h>
+#include <openssl/modes.h>
+#include "cast_lcl.h"
+
+/* The input and output encrypted as though 64bit cbc mode is being
+ * used.
+ */
+
+void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                       long length, const CAST_KEY *schedule, unsigned char 
*ivec,
+                       int enc)
+{
+       if (enc)
+               CRYPTO_cbc64_encrypt(in, out, length, schedule, ivec, 
(block64_f)CAST_block_encrypt);
+       else
+               CRYPTO_cbc64_decrypt(in, out, length, schedule, ivec, 
(block64_f)CAST_block_decrypt);
+}
diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c
index 726d19e0053d..036c3354f83e 100644
--- a/src/lib/libcrypto/cast/c_cfb64.c
+++ b/src/lib/libcrypto/cast/c_cfb64.c
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/cast.h>
+#include <openssl/modes.h>
 #include "cast_lcl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being
@@ -67,55 +68,6 @@
 void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, const CAST_KEY *schedule, unsigned char 
*ivec,
                        int *num, int enc)
-       {
-       CAST_LONG v0,v1,t;
-       int n= *num;
-       long l=length;
-       CAST_LONG ti[2];
-       unsigned char *iv,c,cc;
-
-       iv=ivec;
-       if (enc)
-               {
-               while (l--)
-                       {
-                       if (n == 0)
-                               {
-                               n2l(iv,v0); ti[0]=v0;
-                               n2l(iv,v1); ti[1]=v1;
-                               CAST_encrypt((CAST_LONG *)ti,schedule);
-                               iv=ivec;
-                               t=ti[0]; l2n(t,iv);
-                               t=ti[1]; l2n(t,iv);
-                               iv=ivec;
-                               }
-                       c= *(in++)^iv[n];
-                       *(out++)=c;
-                       iv[n]=c;
-                       n=(n+1)&0x07;
-                       }
-               }
-       else
-               {
-               while (l--)
-                       {
-                       if (n == 0)
-                               {
-                               n2l(iv,v0); ti[0]=v0;
-                               n2l(iv,v1); ti[1]=v1;
-                               CAST_encrypt((CAST_LONG *)ti,schedule);
-                               iv=ivec;
-                               t=ti[0]; l2n(t,iv);
-                               t=ti[1]; l2n(t,iv);
-                               iv=ivec;
-                               }
-                       cc= *(in++);
-                       c=iv[n];
-                       iv[n]=cc;
-                       *(out++)=c^cc;
-                       n=(n+1)&0x07;
-                       }
-               }
-       v0=v1=ti[0]=ti[1]=t=c=cc=0;
-       *num=n;
-       }
+{
+       CRYPTO_cfb64_encrypt(in, out, length, schedule, ivec, num, enc, 
(block64_f) CAST_block_encrypt);
+}
diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c
index 5999a590317f..57417f8aabf2 100644
--- a/src/lib/libcrypto/cast/c_enc.c
+++ b/src/lib/libcrypto/cast/c_enc.c
@@ -127,84 +127,32 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
        }
 #endif
 
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-            const CAST_KEY *ks, unsigned char *iv, int enc)
-       {
-       CAST_LONG tin0,tin1;
-       CAST_LONG tout0,tout1,xor0,xor1;
-       long l=length;
-       CAST_LONG tin[2];
+void CAST_block_encrypt(const unsigned char in[8],
+                       unsigned char out[8],
+                       const CAST_KEY *key)
+{
+       const unsigned char *pin = in;
+       unsigned char *pout = out;
+       CAST_LONG ti[2];
 
-       if (enc)
-               {
-               n2l(iv,tout0);
-               n2l(iv,tout1);
-               iv-=8;
-               for (l-=8; l>=0; l-=8)
-                       {
-                       n2l(in,tin0);
-                       n2l(in,tin1);
-                       tin0^=tout0;
-                       tin1^=tout1;
-                       tin[0]=tin0;
-                       tin[1]=tin1;
-                       CAST_encrypt(tin,ks);
-                       tout0=tin[0];
-                       tout1=tin[1];
-                       l2n(tout0,out);
-                       l2n(tout1,out);
-                       }
-               if (l != -8)
-                       {
-                       n2ln(in,tin0,tin1,l+8);
-                       tin0^=tout0;
-                       tin1^=tout1;
-                       tin[0]=tin0;
-                       tin[1]=tin1;
-                       CAST_encrypt(tin,ks);
-                       tout0=tin[0];
-                       tout1=tin[1];
-                       l2n(tout0,out);
-                       l2n(tout1,out);
-                       }
-               l2n(tout0,iv);
-               l2n(tout1,iv);
-               }
-       else
-               {
-               n2l(iv,xor0);
-               n2l(iv,xor1);
-               iv-=8;
-               for (l-=8; l>=0; l-=8)
-                       {
-                       n2l(in,tin0);
-                       n2l(in,tin1);
-                       tin[0]=tin0;
-                       tin[1]=tin1;
-                       CAST_decrypt(tin,ks);
-                       tout0=tin[0]^xor0;
-                       tout1=tin[1]^xor1;
-                       l2n(tout0,out);
-                       l2n(tout1,out);
-                       xor0=tin0;
-                       xor1=tin1;
-                       }
-               if (l != -8)
-                       {
-                       n2l(in,tin0);
-                       n2l(in,tin1);
-                       tin[0]=tin0;
-                       tin[1]=tin1;
-                       CAST_decrypt(tin,ks);
-                       tout0=tin[0]^xor0;
-                       tout1=tin[1]^xor1;
-                       l2nn(tout0,tout1,out,l+8);
-                       xor0=tin0;
-                       xor1=tin1;
-                       }
-               l2n(xor0,iv);
-               l2n(xor1,iv);
-               }
-       tin0=tin1=tout0=tout1=xor0=xor1=0;
-       tin[0]=tin[1]=0;
-       }
+       n2l(pin, ti[0]);
+       n2l(pin, ti[1]);
+       CAST_encrypt(ti, key);
+       l2n(ti[0], pout);
+       l2n(ti[1], pout);
+}
+
+void CAST_block_decrypt(const unsigned char in[8],
+                       unsigned char out[8],
+                       const CAST_KEY *key)
+{
+       const unsigned char *pin = in;
+       unsigned char *pout = out;
+       CAST_LONG ti[2];
+
+       n2l(pin, ti[0]);
+       n2l(pin, ti[1]);
+       CAST_decrypt(ti, key);
+       l2n(ti[0], pout);
+       l2n(ti[1], pout);
+}
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c
index 611425a66822..526b1f097283 100644
--- a/src/lib/libcrypto/cast/c_ofb64.c
+++ b/src/lib/libcrypto/cast/c_ofb64.c
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/cast.h>
+#include <openssl/modes.h>
 #include "cast_lcl.h"
 
 /* The input and output encrypted as though 64bit ofb mode is being
@@ -66,45 +67,6 @@
 void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, const CAST_KEY *schedule, unsigned char 
*ivec,
                        int *num)
-       {
-       CAST_LONG v0,v1,t;
-       int n= *num;
-       long l=length;
-       unsigned char d[8];
-       char *dp;
-       CAST_LONG ti[2];
-       unsigned char *iv;
-       int save=0;
-
-       iv=ivec;
-       n2l(iv,v0);
-       n2l(iv,v1);
-       ti[0]=v0;
-       ti[1]=v1;
-       dp=(char *)d;
-       l2n(v0,dp);
-       l2n(v1,dp);
-       while (l--)
-               {
-               if (n == 0)
-                       {
-                       CAST_encrypt((CAST_LONG *)ti,schedule);
-                       dp=(char *)d;
-                       t=ti[0]; l2n(t,dp);
-                       t=ti[1]; l2n(t,dp);
-                       save++;
-                       }
-               *(out++)= *(in++)^d[n];
-               n=(n+1)&0x07;
-               }
-       if (save)
-               {
-               v0=ti[0];
-               v1=ti[1];
-               iv=ivec;
-               l2n(v0,iv);
-               l2n(v1,iv);
-               }
-       t=v0=v1=ti[0]=ti[1]=0;
-       *num=n;
-       }
+{
+       CRYPTO_ofb64_encrypt(in, out, length, schedule, ivec, num, (block64_f) 
CAST_block_encrypt);
+}
diff --git a/src/lib/libcrypto/cast/cast_lcl.h 
b/src/lib/libcrypto/cast/cast_lcl.h
index 100ff1f2d2c8..fe4b83898428 100644
--- a/src/lib/libcrypto/cast/cast_lcl.h
+++ b/src/lib/libcrypto/cast/cast_lcl.h
@@ -214,3 +214,11 @@ extern const CAST_LONG CAST_S_table4[256];
 extern const CAST_LONG CAST_S_table5[256];
 extern const CAST_LONG CAST_S_table6[256];
 extern const CAST_LONG CAST_S_table7[256];
+
+void CAST_block_encrypt(const unsigned char in[8],
+                       unsigned char out[8],
+                       const CAST_KEY *key);
+
+void CAST_block_decrypt(const unsigned char in[8],
+                       unsigned char out[8],
+                       const CAST_KEY *key);
-- 
2.27.0

Reply via email to