- Speedup 3DES by using assembly code for i386.

- Sync des/blowfish to more recent openssl.

Obtained from:	KAME/NetBSD
MFC after:	2 weeks

7 files changed, 25 insertions, 5 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 03ebaca..7adae34 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -165,7 +165,6 @@ contrib/ipfilter/netinet/ip_nat.c	optional ipfilter inet
 contrib/ipfilter/netinet/ip_proxy.c	optional ipfilter inet
 contrib/ipfilter/netinet/ip_state.c	optional ipfilter inet
 contrib/ipfilter/netinet/mlfk_ipl.c	optional ipfilter inet
-crypto/blowfish/bf_enc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_skey.c	optional ipsec ipsec_esp
 crypto/cast128/cast128.c	optional ipsec ipsec_esp
 crypto/des/des_ecb.c	optional ipsec ipsec_esp
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 4e3377c..9854c5d 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -178,6 +178,8 @@ compat/linux/linux_socket.c	optional	compat_linux
 compat/linux/linux_sysctl.c	optional	compat_linux
 compat/linux/linux_stats.c	optional	compat_linux
 compat/linux/linux_util.c	optional	compat_linux
+crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
+crypto/des/des_enc.c		optional	ipsec ipsec_esp
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/dec/mcclock.c		optional	mcclock
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 5354291..c552a6e 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -91,8 +91,14 @@ contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
 contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
-crypto/des/des_ecb.c		optional	netsmbcrypto
-crypto/des/des_setkey.c		optional	netsmbcrypto
+bf_enc.o			optional	ipsec ipsec_esp		\
+	dependency	"$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S"		\
+	compile-with	"${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}"	\
+	no-implicit-rule
+crypto/des/arch/i386/des_enc.S		optional	ipsec ipsec_esp
+crypto/des/des_ecb.c			optional	netsmbcrypto
+crypto/des/arch/i386/des_enc.S		optional	netsmbcrypto
+crypto/des/des_setkey.c			optional	netsmbcrypto
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/ar/if_ar_isa.c		optional	ar isa
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index b301f9c..9af5112 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -65,6 +65,8 @@ ia64/ia64/vm_machdep.c		standard
 ia64/isa/isa.c			optional	isa
 ia64/isa/isa_dma.c		optional	isa
 ia64/pci/pci_cfgreg.c		optional	pci
+crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
+crypto/des/des_enc.c		optional	ipsec ipsec_esp
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/fb/fb.c			optional	fb
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index f1a5e16..383d8bd 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -88,8 +88,14 @@ contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
 contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
-crypto/des/des_ecb.c		optional	netsmbcrypto
-crypto/des/des_setkey.c		optional	netsmbcrypto
+bf_enc.o			optional	ipsec ipsec_esp		\
+	dependency	"$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S"		\
+	compile-with	"${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}"	\
+	no-implicit-rule
+crypto/des/arch/i386/des_enc.S		optional	ipsec ipsec_esp
+crypto/des/des_ecb.c			optional	netsmbcrypto
+crypto/des/arch/i386/des_enc.S		optional	netsmbcrypto
+crypto/des/des_setkey.c			optional	netsmbcrypto
 #dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_cbus.c		optional	aic isa
 dev/ar/if_ar_isa.c		optional	ar isa
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 6c09692..c358abd 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -39,6 +39,9 @@ powerpc/powerpc/db_interface.c	optional	ddb
 powerpc/powerpc/db_memrw.c	optional	ddb
 powerpc/powerpc/db_trace.c	optional	ddb
 
+crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
+crypto/des/des_enc.c		optional	ipsec ipsec_esp
+
 dev/ofw/openfirm.c		standard
 dev/ofw/ofw_console.c		standard
 
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 07d3e55..1916b23 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -8,6 +8,8 @@
 # dependency lines other than the first are silently ignored.
 #
 
+crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
+crypto/des/des_enc.c		optional	ipsec ipsec_esp
 dev/ofw/ofw_console.c		optional	ofw_console
 dev/ofw/openfirm.c		standard
 libkern/ffs.c			standard