summaryrefslogtreecommitdiffstats
path: root/sys/modules/crypto
diff options
context:
space:
mode:
authorwkoszek <wkoszek@FreeBSD.org>2006-02-27 16:56:22 +0000
committerwkoszek <wkoszek@FreeBSD.org>2006-02-27 16:56:22 +0000
commit296928cec1bbec980dbc12f6b56a3419651cc819 (patch)
tree90c53c0ea97b80896810305acd80ed5c26b81d77 /sys/modules/crypto
parent3ad16c4a5f6685c188056cbd45faf762e1e6819e (diff)
downloadFreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.zip
FreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.tar.gz
This patch fixes a problem, which exists if you have IPSEC in your kernel
and want to have crypto support loaded as KLD. By moving zlib to separate module and adding MODULE_DEPEND directives, it is possible to use such configuration without complication. Otherwise, since IPSEC is linked with zlib (just like crypto.ko) you'll get following error: interface zlib.1 already present in the KLD 'kernel'! Approved by: cognet (mentor)
Diffstat (limited to 'sys/modules/crypto')
-rw-r--r--sys/modules/crypto/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 01fdd4b..6d06004 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -6,7 +6,6 @@
.PATH: ${.CURDIR}/../../crypto/des
.PATH: ${.CURDIR}/../../crypto/rijndael
.PATH: ${.CURDIR}/../../crypto/sha2
-.PATH: ${.CURDIR}/../../net
KMOD = crypto
SRCS = crypto.c
@@ -15,7 +14,6 @@ SRCS += cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
SRCS += skipjack.c bf_enc.c bf_skey.c
SRCS += des_ecb.c des_enc.c des_setkey.c
SRCS += sha1.c sha2.c
-SRCS += zlib.c
SRCS += opt_param.h
.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud