aboutsummaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2015-06-30 17:00:45 +0000
committerMark Murray <markm@FreeBSD.org>2015-06-30 17:00:45 +0000
commitd1b06863fbc7b142d7afdf2d399087e2fab40f16 (patch)
tree82d243ed8a8d99736037cb5fd91f951a7c437dad /sys/modules
parent6ef120027fbb5e7798fcb4f2cfdcf2e65bd8f1ba (diff)
Notes
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile4
-rw-r--r--sys/modules/crypto/Makefile2
-rw-r--r--sys/modules/random/Makefile15
3 files changed, 1 insertions, 20 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6be9ad6395ef..5f8ba1d62aad 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -291,7 +291,6 @@ SUBDIR= \
${_qlxgbe} \
ral \
${_ralfw} \
- ${_random} \
rc4 \
${_rdma} \
${_rdrand_rng} \
@@ -395,9 +394,6 @@ _autofs= autofs
_crypto= crypto
_cryptodev= cryptodev
.endif
-.if exists(${.CURDIR}/../crypto)
-_random= random
-.endif
.endif
.if ${MK_CUSE} != "no" || defined(ALL_MODULES)
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 9153445de7d6..4506cb3342c6 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -12,7 +12,7 @@
KMOD = crypto
SRCS = crypto.c cryptodev_if.c
SRCS += criov.c cryptosoft.c xform.c
-SRCS += cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
+SRCS += cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c rijndael-api-fst.c
SRCS += skipjack.c bf_enc.c bf_ecb.c bf_skey.c
SRCS += camellia.c camellia-api.c
SRCS += des_ecb.c des_enc.c des_setkey.c
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
deleted file mode 100644
index b42eac7da665..000000000000
--- a/sys/modules/random/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/random
-.PATH: ${.CURDIR}/../../crypto/rijndael
-.PATH: ${.CURDIR}/../../crypto/sha2
-
-KMOD= random
-SRCS= randomdev_soft.c
-SRCS+= yarrow.c fortuna.c hash.c
-SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
-SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h
-
-CFLAGS+= -I${.CURDIR}/../..
-
-.include <bsd.kmod.mk>