- Speedup 3DES by using assembly code for i386.

- Sync des/blowfish to more recent openssl.

Obtained from:	KAME/NetBSD
MFC after:	2 weeks

1 files changed, 70 insertions, 55 deletions

diff --git a/sys/crypto/blowfish/bf_enc.c b/sys/crypto/blowfish/bf_enc.c
index 5edd6db..831db17 100644
--- a/sys/crypto/blowfish/bf_enc.c
+++ b/sys/crypto/blowfish/bf_enc.c
@@ -1,12 +1,12 @@
 /*	$FreeBSD$	*/
-/*	$KAME: bf_enc.c,v 1.5 2000/09/18 21:21:19 itojun Exp $	*/
+/*	$KAME: bf_enc.c,v 1.7 2002/02/27 01:33:59 itojun Exp $	*/
 
 /* crypto/bf/bf_enc.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
+ * 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
@@ -14,7 +14,7 @@
  * 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@mincom.oz.au).
+ * 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.
@@ -34,12 +34,12 @@
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *    "This product includes cryptographic software written by
- *     Eric Young (eay@mincom.oz.au)"
+ *     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
  *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@mincom.oz.au)"
+ *    "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
@@ -75,10 +75,9 @@ to modify the code.
 
 /* XXX "data" is host endian */
 void
-BF_encrypt(data, key, encrypt)
+BF_encrypt(data, key)
 	BF_LONG *data;
 	BF_KEY *key;
-	int encrypt;
 {
 	register BF_LONG l, r, *p, *s;
 
@@ -87,57 +86,73 @@ BF_encrypt(data, key, encrypt)
 	l = data[0];
 	r = data[1];
 
-	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]);
+	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]);
 #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];
+
+	data[1] = l & 0xffffffff;
+	data[0] = r & 0xffffffff;
+}
+
+/* XXX "data" is host endian */
+void
+BF_decrypt(data, key)
+	BF_LONG *data;
+	BF_KEY *key;
+{
+	register BF_LONG l, r, *p, *s;
+
+	p = key->P;
+	s= &key->S[0];
+	l = data[0];
+	r = data[1];
+
+	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];
-	}
+	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;
 }