Sync with recent KAME.

This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.

TODO:
  - The definitions of SADB_* in sys/net/pfkeyv2.h are still different
    from RFC2407/IANA assignment because of binary compatibility
    issue.  It should be fixed under 5-CURRENT.
  - ip6po_m member of struct ip6_pktopts is no longer used.  But, it
    is still there because of binary compatibility issue.  It should
    be removed under 5-CURRENT.

Reviewed by:	itojun
Obtained from:	KAME
MFC after:	3 weeks

1 files changed, 62 insertions, 62 deletions

diff --git a/sys/crypto/blowfish/bf_enc.c b/sys/crypto/blowfish/bf_enc.c
index 6a3bef6..5edd6db 100644
--- a/sys/crypto/blowfish/bf_enc.c
+++ b/sys/crypto/blowfish/bf_enc.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD$	*/
-/*	$KAME: bf_enc.c,v 1.3 2000/03/27 04:36:26 sumikawa Exp $	*/
+/*	$KAME: bf_enc.c,v 1.5 2000/09/18 21:21:19 itojun Exp $	*/
 
 /* crypto/bf/bf_enc.c */
 /* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au)
@@ -59,6 +59,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
 #include <crypto/blowfish/bf_locl.h>
 
@@ -72,72 +73,71 @@ If you set BF_ROUNDS to some value other than 16 or 20, you will have
 to modify the code.
 #endif
 
-void BF_encrypt(data,key,encrypt)
-BF_LONG *data;
-BF_KEY *key;
-int encrypt;
-	{
-	register BF_LONG l,r,*p,*s;
+/* XXX "data" is host endian */
+void
+BF_encrypt(data, key, encrypt)
+	BF_LONG *data;
+	BF_KEY *key;
+	int encrypt;
+{
+	register BF_LONG l, r, *p, *s;
 
-	p=key->P;
-	s= &(key->S[0]);
-	l=data[0];
-	r=data[1];
+	p = key->P;
+	s= &key->S[0];
+	l = data[0];
+	r = data[1];
 
-	if (encrypt)
-		{
+	if (encrypt) {
 		l^=p[0];
-		BF_ENC(r,l,s,p[ 1]);
-		BF_ENC(l,r,s,p[ 2]);
-		BF_ENC(r,l,s,p[ 3]);
-		BF_ENC(l,r,s,p[ 4]);
-		BF_ENC(r,l,s,p[ 5]);
-		BF_ENC(l,r,s,p[ 6]);
-		BF_ENC(r,l,s,p[ 7]);
-		BF_ENC(l,r,s,p[ 8]);
-		BF_ENC(r,l,s,p[ 9]);
-		BF_ENC(l,r,s,p[10]);
-		BF_ENC(r,l,s,p[11]);
-		BF_ENC(l,r,s,p[12]);
-		BF_ENC(r,l,s,p[13]);
-		BF_ENC(l,r,s,p[14]);
-		BF_ENC(r,l,s,p[15]);
-		BF_ENC(l,r,s,p[16]);
+		BF_ENC(r, l, s, p[ 1]);
+		BF_ENC(l, r, s, p[ 2]);
+		BF_ENC(r, l, s, p[ 3]);
+		BF_ENC(l, r, s, p[ 4]);
+		BF_ENC(r, l, s, p[ 5]);
+		BF_ENC(l, r, s, p[ 6]);
+		BF_ENC(r, l, s, p[ 7]);
+		BF_ENC(l, r, s, p[ 8]);
+		BF_ENC(r, l, s, p[ 9]);
+		BF_ENC(l, r, s, p[10]);
+		BF_ENC(r, l, s, p[11]);
+		BF_ENC(l, r, s, p[12]);
+		BF_ENC(r, l, s, p[13]);
+		BF_ENC(l, r, s, p[14]);
+		BF_ENC(r, l, s, p[15]);
+		BF_ENC(l, r, s, p[16]);
 #if BF_ROUNDS == 20
-		BF_ENC(r,l,s,p[17]);
-		BF_ENC(l,r,s,p[18]);
-		BF_ENC(r,l,s,p[19]);
-		BF_ENC(l,r,s,p[20]);
+		BF_ENC(r, l, s, p[17]);
+		BF_ENC(l, r, s, p[18]);
+		BF_ENC(r, l, s, p[19]);
+		BF_ENC(l, r, s, p[20]);
 #endif
-		r^=p[BF_ROUNDS+1];
-		}
-	else
-		{
-		l^=p[BF_ROUNDS+1];
+		r ^= p[BF_ROUNDS + 1];
+	} else {
+		l ^= p[BF_ROUNDS + 1];
 #if BF_ROUNDS == 20
-		BF_ENC(r,l,s,p[20]);
-		BF_ENC(l,r,s,p[19]);
-		BF_ENC(r,l,s,p[18]);
-		BF_ENC(l,r,s,p[17]);
+		BF_ENC(r, l, s, p[20]);
+		BF_ENC(l, r, s, p[19]);
+		BF_ENC(r, l, s, p[18]);
+		BF_ENC(l, r, s, p[17]);
 #endif
-		BF_ENC(r,l,s,p[16]);
-		BF_ENC(l,r,s,p[15]);
-		BF_ENC(r,l,s,p[14]);
-		BF_ENC(l,r,s,p[13]);
-		BF_ENC(r,l,s,p[12]);
-		BF_ENC(l,r,s,p[11]);
-		BF_ENC(r,l,s,p[10]);
-		BF_ENC(l,r,s,p[ 9]);
-		BF_ENC(r,l,s,p[ 8]);
-		BF_ENC(l,r,s,p[ 7]);
-		BF_ENC(r,l,s,p[ 6]);
-		BF_ENC(l,r,s,p[ 5]);
-		BF_ENC(r,l,s,p[ 4]);
-		BF_ENC(l,r,s,p[ 3]);
-		BF_ENC(r,l,s,p[ 2]);
-		BF_ENC(l,r,s,p[ 1]);
-		r^=p[0];
-		}
-	data[1]=l&0xffffffff;
-	data[0]=r&0xffffffff;
+		BF_ENC(r, l, s, p[16]);
+		BF_ENC(l, r, s, p[15]);
+		BF_ENC(r, l, s, p[14]);
+		BF_ENC(l, r, s, p[13]);
+		BF_ENC(r, l, s, p[12]);
+		BF_ENC(l, r, s, p[11]);
+		BF_ENC(r, l, s, p[10]);
+		BF_ENC(l, r, s, p[ 9]);
+		BF_ENC(r, l, s, p[ 8]);
+		BF_ENC(l, r, s, p[ 7]);
+		BF_ENC(r, l, s, p[ 6]);
+		BF_ENC(l, r, s, p[ 5]);
+		BF_ENC(r, l, s, p[ 4]);
+		BF_ENC(l, r, s, p[ 3]);
+		BF_ENC(r, l, s, p[ 2]);
+		BF_ENC(l, r, s, p[ 1]);
+		r ^= p[0];
 	}
+	data[1] = l & 0xffffffff;
+	data[0] = r & 0xffffffff;
+}