1 files changed, 47 insertions, 44 deletions

diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c
index 8191d17d8e..8c214f7428 100644
--- a/src/lib/libcrypto/bf/bf_skey.c
+++ b/src/lib/libcrypto/bf/bf_skey.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: bf_skey.c,v 1.12 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_skey.c,v 1.13 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
@@ -63,55 +63,58 @@
 #include "bf_locl.h"
 #include "bf_pi.h"
 
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
-        {
+void
+BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+{
         int i;
-        BF_LONG *p,ri,in[2];
-        const unsigned char *d,*end;
+        BF_LONG *p, ri, in[2];
+        const unsigned char *d, *end;
 
 
-        memcpy(key,&bf_init,sizeof(BF_KEY));
-        p=key->P;
+        memcpy(key, &bf_init, sizeof(BF_KEY));
+        p = key->P;
 
-        if (len > ((BF_ROUNDS+2)*4)) len=(BF_ROUNDS+2)*4;
+        if (len > ((BF_ROUNDS + 2)*4))
+                len = (BF_ROUNDS + 2)*4;
 
-        d=data;
-        end= &(data[len]);
-        for (i=0; i<(BF_ROUNDS+2); i++)
-                {
+        d = data;
+        end = &(data[len]);
+        for (i = 0; i < (BF_ROUNDS + 2); i++) {
                 ri= *(d++);
-                if (d >= end) d=data;
+                if (d >= end)
+                        d = data;
 
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
+                ri <<= 8;
+                ri |= *(d++);
+                if (d >= end)
+                        d = data;
 
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
+                ri <<= 8;
+                ri |= *(d++);
+                if (d >= end)
+                        d = data;
 
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
+                ri <<= 8;
+                ri |= *(d++);
+                if (d >= end)
+                        d = data;
 
                 p[i]^=ri;
-                }
+        }
 
-        in[0]=0L;
-        in[1]=0L;
-        for (i=0; i<(BF_ROUNDS+2); i+=2)
-                {
-                BF_encrypt(in,key);
-                p[i  ]=in[0];
-                p[i+1]=in[1];
-                }
+        in[0] = 0L;
+        in[1] = 0L;
+        for (i = 0; i < (BF_ROUNDS + 2); i += 2) {
+                BF_encrypt(in, key);
+                p[i  ] = in[0];
+                p[i + 1] = in[1];
+        }
 
-        p=key->S;
-        for (i=0; i<4*256; i+=2)
-                {
-                BF_encrypt(in,key);
-                p[i  ]=in[0];
-                p[i+1]=in[1];
-                }
+        p = key->S;
+        for (i = 0; i < 4*256; i += 2) {
+                BF_encrypt(in, key);
+                p[i  ] = in[0];
+                p[i + 1] = in[1];
         }
+}