X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fos_crypto%2Fblowfish%2Fbf_skey.c;fp=src%2Fos_crypto%2Fblowfish%2Fbf_skey.c;h=9dc2f79052e193948d6df22e847ba679e5405d39;hp=f38a4ceea70c7637f1cfebed6d5832a75a68ad6d;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/os_crypto/blowfish/bf_skey.c b/src/os_crypto/blowfish/bf_skey.c
old mode 100755
new mode 100644
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];
+    }
+}