hookup new crypto support to the config/build process

8 files changed, 62 insertions, 0 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d43789d..e01e011 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2155,6 +2155,25 @@ options 	USB_DEBUG
 options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	UKBD_DFLT_KEYMAP=it.iso
 
+#####################################################################
+# crypto subsystem
+#
+# This is a port of the openbsd crypto framework.  Include this when
+# configuring FAST_IPSEC and when you have a h/w crypto device to accelerate
+# user applications that link to openssl.
+#
+# Drivers are ports from openbsd with some simple enhancements that have
+# been fed back to openbsd.
+
+device		crypto		# core crypto support
+device		cryptodev	# /dev/crypto for access to h/w
+
+device		hifn		# Hifn 7951, 7781, etc.
+device		ubsec		# Broadcom 5501, 5601, 58xx
+
+#####################################################################
+
+
 #
 # Embedded system options:
 #
diff --git a/sys/conf/files b/sys/conf/files
index 57ccb86..352d8d2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -414,6 +414,7 @@ dev/hfa/hfa_freebsd.c	optional hfa
 #dev/hfa/hfa_eisa.c	optional hfa eisa
 dev/hfa/hfa_pci.c	optional hfa pci
 #dev/hfa/hfa_sbus.c	optional hfa sbus
+dev/hifn/hifn7751.c	optional hifn
 dev/hme/if_hme.c	optional hme
 dev/hme/if_hme_pci.c	optional hme pci
 dev/hme/if_hme_sbus.c	optional hme sbus
@@ -654,6 +655,7 @@ dev/twe/twe.c		optional twe
 dev/twe/twe_freebsd.c	optional twe
 dev/tx/if_tx.c		optional tx
 dev/txp/if_txp.c	optional txp
+dev/ubsec/ubsec.c	optional ubsec
 #
 # USB support
 dev/usb/usb_if.m	optional usb
@@ -1090,6 +1092,7 @@ net/slcompress.c	optional sl
 net/slcompress.c	optional sppp
 net/zlib.c		optional ppp_deflate
 net/zlib.c		optional ipsec
+net/zlib.c		optional crypto
 netatalk/aarp.c		optional netatalk
 netatalk/at_control.c	optional netatalk
 netatalk/at_proto.c	optional netatalk
@@ -1342,6 +1345,23 @@ nfsserver/nfs_srvsock.c		optional nfsserver
 nfsserver/nfs_srvcache.c	optional nfsserver
 nfsserver/nfs_srvsubs.c		optional nfsserver
 nfsserver/nfs_syscalls.c	optional nfsserver
+# crypto support
+opencrypto/cast.c		optional crypto
+opencrypto/criov.c		optional crypto
+opencrypto/crmbuf.c		optional crypto
+opencrypto/crypto.c		optional crypto
+opencrypto/cryptodev.c		optional cryptodev
+opencrypto/cryptosoft.c		optional crypto
+opencrypto/deflate.c		optional crypto
+opencrypto/rmd160.c		optional crypto
+opencrypto/rijndael.c		optional crypto
+opencrypto/skipjack.c		optional crypto
+opencrypto/xform.c		optional crypto
+crypto/blowfish/bf_skey.c	optional crypto
+crypto/des/des_ecb.c		optional crypto
+crypto/des/des_setkey.c		optional crypto
+crypto/sha1.c			optional crypto
+crypto/sha2/sha2.c		optional crypto
 pccard/pccard.c		count card
 pccard/pccard_beep.c	optional card
 pccard/pccard_nbk.c	optional card
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 017e049..0ea7dae 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -163,6 +163,8 @@ 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
+crypto/blowfish/bf_enc.c	optional	crypto
+crypto/des/des_enc.c		optional	crypto
 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 0a21480..4b58f62 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -99,6 +99,13 @@ 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
+bf_enc.o			optional	crypto		\
+	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	crypto
+crypto/des/des_ecb.c			optional	crypto
+crypto/des/des_setkey.c			optional	crypto
 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 5e710a4..9b68ea6 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -73,6 +73,8 @@ 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
+crypto/blowfish/bf_enc.c	optional	crypto
+crypto/des/des_enc.c		optional	crypto
 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 742e0c9..1a6a34d 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -96,6 +96,13 @@ 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
+bf_enc.o			optional	crypto		\
+	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	crypto
+crypto/des/des_ecb.c			optional	crypto
+crypto/des/des_setkey.c			optional	crypto
 dev/aic/aic_cbus.c		optional	aic isa
 dev/ar/if_ar_isa.c		optional	ar isa
 dev/cm/if_cm_isa.c		optional	cm isa
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 58fdc97..5ab4d54 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -10,6 +10,8 @@
 
 crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
 crypto/des/des_enc.c		optional	ipsec ipsec_esp
+crypto/blowfish/bf_enc.c	optional	crypto
+crypto/des/des_enc.c		optional	crypto
 dev/ofw/ofw_console.c		optional	ofw_console
 dev/ofw/openfirm.c		standard
 dev/sio/sio.c			optional	sio
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 40f0eb9..ed93695 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -19,6 +19,7 @@ SUBDIR=	3dfx \
 	ccd \
 	cd9660 \
 	coda \
+	cryptodev \
 	cue \
 	dc \
 	de \
@@ -30,6 +31,7 @@ SUBDIR=	3dfx \
 	firewire \
 	fxp \
 	gx \
+	hifn \
 	if_disc \
 	if_ef \
 	if_gif \
@@ -94,6 +96,7 @@ SUBDIR=	3dfx \
 	twe \
 	tx \
 	txp \
+	ubsec \
 	ucom \
 	udbp \
 	ufm \