new upstream release (3.3.0); modify package compatibility for Stretch

[ossec-hids.git] / src / os_crypto / blowfish / bf_skey.c

diff --git a/src/os_crypto/blowfish/bf_skey.c b/src/os_crypto/blowfish/bf_skey.c
old mode 100755 (executable)
new mode 100644 (file)
index f38a4ce..9dc2f79
--- a/src/os_crypto/blowfish/bf_skey.c
+++ b/src/os_crypto/blowfish/bf_skey.c
@@ -1,4 +1,3 @@
-/* crypto/bf/bf_skey.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,59 +57,68 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "blowfish.h"
 #include "bf_locl.h"
 #include "bf_pi.h"
 
+
 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;
+{
+    int i;
+    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++)
-               {
-               ri= *(d++);
-               if (d >= end) d=data;
+    d = data;
+    end = &(data[len]);
+    for (i = 0; i < (BF_ROUNDS + 2); i++) {
+        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;
+        ri <<= 8;
+        ri |= *(d++);
+        if (d >= end) {
+            d = data;
+        }
 
-               p[i]^=ri;
-               }
+        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];
+    }
+}