Hit the des directory with the loving mallet of knfmt

ok tb@

1 files changed, 42 insertions, 38 deletions

diff --git a/src/lib/libcrypto/des/ecb_enc.c b/src/lib/libcrypto/des/ecb_enc.c
index 35ce711315..7cc8cc687f 100644
--- a/src/lib/libcrypto/des/ecb_enc.c
+++ b/src/lib/libcrypto/des/ecb_enc.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: ecb_enc.c,v 1.17 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: ecb_enc.c,v 1.18 2023/07/08 07:11:07 beck 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
@@ -60,59 +60,63 @@
 #include <openssl/opensslv.h>
 #include <openssl/bio.h>
 
-const char *DES_options(void)
-        {
-        static int init=1;
+const char *
+DES_options(void)
+{
+        static int init = 1;
         static char buf[32];
 
-        if (init)
-                {
-                const char *ptr,*unroll,*risc,*size;
+        if (init) {
+                const char *ptr, *unroll, *risc, *size;
 
 #ifdef DES_PTR
-                ptr="ptr";
+                ptr = "ptr";
 #else
-                ptr="idx";
+                ptr = "idx";
 #endif
 #if defined(DES_RISC1) || defined(DES_RISC2)
 #ifdef DES_RISC1
-                risc="risc1";
+                risc = "risc1";
 #endif
 #ifdef DES_RISC2
-                risc="risc2";
+                risc = "risc2";
 #endif
 #else
-                risc="cisc";
+                risc = "cisc";
 #endif
 #ifdef DES_UNROLL
-                unroll="16";
+                unroll = "16";
 #else
-                unroll="2";
+                unroll = "2";
 #endif
                 if (sizeof(DES_LONG) != sizeof(long))
-                        size="int";
+                        size = "int";
                 else
-                        size="long";
-                snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,
-                             size);
-                init=0;
-                }
-        return(buf);
+                        size = "long";
+                snprintf(buf, sizeof buf, "des(%s,%s,%s,%s)", ptr, risc, unroll,
+                    size);
+                init = 0;
         }
-                
+        return (buf);
+}
 
-void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc)
-        {
+void
+DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
+    DES_key_schedule *ks, int enc)
+{
         DES_LONG l;
         DES_LONG ll[2];
         const unsigned char *in = &(*input)[0];
         unsigned char *out = &(*output)[0];
 
-        c2l(in,l); ll[0]=l;
-        c2l(in,l); ll[1]=l;
-        DES_encrypt1(ll,ks,enc);
-        l=ll[0]; l2c(l,out);
-        l=ll[1]; l2c(l,out);
-        l=ll[0]=ll[1]=0;
-        }
+        c2l(in, l);
+        ll[0] = l;
+        c2l(in, l);
+        ll[1] = l;
+        DES_encrypt1(ll, ks, enc);
+        l = ll[0];
+        l2c(l, out);
+        l = ll[1];
+        l2c(l, out);
+        l = ll[0] = ll[1] = 0;
+}