Hit the des directory with the loving mallet of knfmt

ok tb@

1 files changed, 80 insertions, 71 deletions

diff --git a/src/lib/libcrypto/des/ncbc_enc.c b/src/lib/libcrypto/des/ncbc_enc.c
index f2e1274b7e..d7e47813b3 100644
--- a/src/lib/libcrypto/des/ncbc_enc.c
+++ b/src/lib/libcrypto/des/ncbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncbc_enc.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: ncbc_enc.c,v 1.9 2023/07/08 07:11:07 beck Exp $ */
 /*
  * #included by:
  *    cbc_enc.c  (DES_cbc_encrypt)
@@ -10,21 +10,21 @@
  * 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:
@@ -39,10 +39,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
@@ -54,7 +54,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
@@ -64,85 +64,94 @@
 #include "des_local.h"
 
 #ifdef CBC_ENC_C__DONT_UPDATE_IV
-void DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
+void
+DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+    DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
 #else
-void DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
+void
+DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+    DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
 #endif
-        {
-        DES_LONG tin0,tin1;
-        DES_LONG tout0,tout1,xor0,xor1;
-        long l=length;
+{
+        DES_LONG tin0, tin1;
+        DES_LONG tout0, tout1, xor0, xor1;
+        long l = length;
         DES_LONG tin[2];
         unsigned char *iv;
 
         iv = &(*ivec)[0];
 
-        if (enc)
+        if (enc) {
+                c2l(iv, tout0);
+                c2l(iv, tout1);
+                for (l -= 8; l >= 0; l -= 8)
                 {
-                c2l(iv,tout0);
-                c2l(iv,tout1);
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0);
-                        c2l(in,tin1);
-                        tin0^=tout0; tin[0]=tin0;
-                        tin1^=tout1; tin[1]=tin1;
-                        DES_encrypt1((DES_LONG *)tin,_schedule,DES_ENCRYPT);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        c2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0; tin[0]=tin0;
-                        tin1^=tout1; tin[1]=tin1;
-                        DES_encrypt1((DES_LONG *)tin,_schedule,DES_ENCRYPT);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
+                        c2l(in, tin0);
+                        c2l(in, tin1);
+                        tin0 ^= tout0;
+                        tin[0] = tin0;
+                        tin1 ^= tout1;
+                        tin[1] = tin1;
+                        DES_encrypt1((DES_LONG *)tin, _schedule, DES_ENCRYPT);
+                        tout0 = tin[0];
+                        l2c(tout0, out);
+                        tout1 = tin[1];
+                        l2c(tout1, out);
+                }
+                if (l != -8) {
+                        c2ln(in, tin0, tin1, l + 8);
+                        tin0 ^= tout0;
+                        tin[0] = tin0;
+                        tin1 ^= tout1;
+                        tin[1] = tin1;
+                        DES_encrypt1((DES_LONG *)tin, _schedule, DES_ENCRYPT);
+                        tout0 = tin[0];
+                        l2c(tout0, out);
+                        tout1 = tin[1];
+                        l2c(tout1, out);
+                }
 #ifndef CBC_ENC_C__DONT_UPDATE_IV
                 iv = &(*ivec)[0];
-                l2c(tout0,iv);
-                l2c(tout1,iv);
+                l2c(tout0, iv);
+                l2c(tout1, iv);
 #endif
-                }
-        else
+        } else {
+                c2l(iv, xor0);
+                c2l(iv, xor1);
+                for (l -= 8; l >= 0; l -= 8)
                 {
-                c2l(iv,xor0);
-                c2l(iv,xor1);
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        DES_encrypt1((DES_LONG *)tin,_schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2c(tout0,out);
-                        l2c(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        DES_encrypt1((DES_LONG *)tin,_schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2cn(tout0,tout1,out,l+8);
+                        c2l(in, tin0);
+                        tin[0] = tin0;
+                        c2l(in, tin1);
+                        tin[1] = tin1;
+                        DES_encrypt1((DES_LONG *)tin, _schedule, DES_DECRYPT);
+                        tout0 = tin[0] ^ xor0;
+                        tout1 = tin[1] ^ xor1;
+                        l2c(tout0, out);
+                        l2c(tout1, out);
+                        xor0 = tin0;
+                        xor1 = tin1;
+                }
+                if (l != -8) {
+                        c2l(in, tin0);
+                        tin[0] = tin0;
+                        c2l(in, tin1);
+                        tin[1] = tin1;
+                        DES_encrypt1((DES_LONG *)tin, _schedule, DES_DECRYPT);
+                        tout0 = tin[0] ^ xor0;
+                        tout1 = tin[1] ^ xor1;
+                        l2cn(tout0, tout1, out, l + 8);
 #ifndef CBC_ENC_C__DONT_UPDATE_IV
-                        xor0=tin0;
-                        xor1=tin1;
+                        xor0 = tin0;
+                        xor1 = tin1;
 #endif
-                        }
+                }
 #ifndef CBC_ENC_C__DONT_UPDATE_IV 
                 iv = &(*ivec)[0];
-                l2c(xor0,iv);
-                l2c(xor1,iv);
+                l2c(xor0, iv);
+                l2c(xor1, iv);
 #endif
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
         }
+        tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+        tin[0] = tin[1] = 0;
+}