1 files changed, 77 insertions, 83 deletions

diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c
index 6f45f9ae4c..58e85b63c8 100644
--- a/src/lib/libcrypto/bf/bf_cbc.c
+++ b/src/lib/libcrypto/bf/bf_cbc.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: bf_cbc.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: bf_cbc.c,v 1.6 2022/11/11 12:08:29 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@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 (tjh@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:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@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 
+ * 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 (tjh@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
@@ -49,7 +49,7 @@
  * 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
@@ -59,85 +59,79 @@
 #include <openssl/blowfish.h>
 #include "bf_locl.h"
 
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-             const BF_KEY *schedule, unsigned char *ivec, int encrypt)
-        {
-        BF_LONG tin0,tin1;
-        BF_LONG tout0,tout1,xor0,xor1;
-        long l=length;
+void
+BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+    const BF_KEY *schedule, unsigned char *ivec, int encrypt)
+{
+        BF_LONG tin0, tin1;
+        BF_LONG tout0, tout1, xor0, xor1;
+        long l = length;
         BF_LONG tin[2];
 
-        if (encrypt)
-                {
-                n2l(ivec,tout0);
-                n2l(ivec,tout1);
-                ivec-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_encrypt(tin,schedule);
-                        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;
-                        BF_encrypt(tin,schedule);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                l2n(tout0,ivec);
-                l2n(tout1,ivec);
+        if (encrypt) {
+                n2l(ivec, tout0);
+                n2l(ivec, tout1);
+                ivec -= 8;
+                for (l -= 8; l >= 0; l -= 8) {
+                        n2l(in, tin0);
+                        n2l(in, tin1);
+                        tin0 ^= tout0;
+                        tin1 ^= tout1;
+                        tin[0] = tin0;
+                        tin[1] = tin1;
+                        BF_encrypt(tin, schedule);
+                        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;
+                        BF_encrypt(tin, schedule);
+                        tout0 = tin[0];
+                        tout1 = tin[1];
+                        l2n(tout0, out);
+                        l2n(tout1, out);
+                }
+                l2n(tout0, ivec);
+                l2n(tout1, ivec);
+        } else {
+                n2l(ivec, xor0);
+                n2l(ivec, xor1);
+                ivec -= 8;
+                for (l -= 8; l >= 0; l -= 8) {
+                        n2l(in, tin0);
+                        n2l(in, tin1);
+                        tin[0] = tin0;
+                        tin[1] = tin1;
+                        BF_decrypt(tin, schedule);
+                        tout0 = tin[0]^xor0;
+                        tout1 = tin[1]^xor1;
+                        l2n(tout0, out);
+                        l2n(tout1, out);
+                        xor0 = tin0;
+                        xor1 = tin1;
                 }
-        else
-                {
-                n2l(ivec,xor0);
-                n2l(ivec,xor1);
-                ivec-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_decrypt(tin,schedule);
-                        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;
-                        BF_decrypt(tin,schedule);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2nn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                l2n(xor0,ivec);
-                l2n(xor1,ivec);
+                if (l != -8) {
+                        n2l(in, tin0);
+                        n2l(in, tin1);
+                        tin[0] = tin0;
+                        tin[1] = tin1;
+                        BF_decrypt(tin, schedule);
+                        tout0 = tin[0]^xor0;
+                        tout1 = tin[1]^xor1;
+                        l2nn(tout0, tout1, out, l + 8);
+                        xor0 = tin0;
+                        xor1 = tin1;
                 }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
+                l2n(xor0, ivec);
+                l2n(xor1, ivec);
         }
+        tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+        tin[0] = tin[1] = 0;
+}