From 15bbdecf2e46f15d3d2c1e4d81f144a684bc7956 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Sun, 25 Jun 2000 09:18:13 +0000 Subject: [PATCH] Get the build bits right for the new Architecture Independant null- and entropy drivers. Reviewed by: dfr(mostly) --- sys/alpha/conf/GENERIC | 1 + sys/alpha/conf/NOTES | 1 + sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/Makefile | 3 +++ sys/conf/NOTES | 3 +++ sys/conf/files | 7 ++++++- sys/conf/options | 1 + sys/i386/conf/GENERIC | 1 + sys/i386/conf/Makefile | 3 +++ sys/i386/conf/NOTES | 3 +++ 10 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 874107712c46..c8051d856244 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -68,6 +68,7 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING +options RANDOMDEV #entropy device # Standard busses device isa diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 874107712c46..c8051d856244 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -68,6 +68,7 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING +options RANDOMDEV #entropy device # Standard busses device isa diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index a246930564b3..2e2bc9d6dfa2 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -55,6 +55,7 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options RANDOMDEV #entropy device # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile index 67fff855f985..acf1e11b1fee 100644 --- a/sys/amd64/conf/Makefile +++ b/sys/amd64/conf/Makefile @@ -3,5 +3,8 @@ all: @echo "make LINT only" +clean: + rm LINT + LINT: NOTES makeLINT.pl perl5 makeLINT.pl < NOTES > LINT diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 75c1783e29e3..567fb47fac81 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -711,6 +711,9 @@ options EXT2FS # inclusion on shell boxes. options VFS_AIO +# Cryptographically secure random number generator; /dev/[u]random +options RANDOMDEV + ##################################################################### # POSIX P1003.1B diff --git a/sys/conf/files b/sys/conf/files index e249ec5a17c0..9cd9299f3298 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -196,6 +196,7 @@ dev/mii/miibus_if.m optional miibus dev/mlx/mlx.c optional mlx dev/mlx/mlx_disk.c optional mlx dev/mlx/mlx_pci.c optional mlx +dev/nulldev/nulldev.c standard dev/pccard/card_if.m optional card dev/pccard/card_if.m optional pccard dev/pccard/pccard.c optional pccard @@ -224,6 +225,11 @@ dev/ppbus/ppi.c optional ppi dev/ppbus/pps.c optional pps dev/ppbus/vpo.c optional vpo dev/ppbus/vpoio.c optional vpo +dev/randomdev/randomdev.c optional randomdev +dev/randomdev/yarrow.c optional randomdev +crypto/blowfish/bf_cbc.c optional randomdev +crypto/blowfish/bf_enc.c optional randomdev +crypto/blowfish/bf_skey.c optional randomdev dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci @@ -406,7 +412,6 @@ kern/kern_ntptime.c standard kern/kern_physio.c standard kern/kern_proc.c standard kern/kern_prot.c standard -kern/kern_random.c standard kern/kern_resource.c standard kern/kern_shutdown.c standard kern/kern_sig.c standard diff --git a/sys/conf/options b/sys/conf/options index 0f46bc57d1f3..ad8363f0a40f 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -62,6 +62,7 @@ NTIMECOUNTER opt_ntp.h NSWAPDEV opt_swap.h PPS_SYNC opt_ntp.h QUOTA +RANDOMDEV SPX_HACK SUIDDIR opt_suiddir.h SYSVMSG opt_sysvipc.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index a246930564b3..2e2bc9d6dfa2 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -55,6 +55,7 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options RANDOMDEV #entropy device # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel diff --git a/sys/i386/conf/Makefile b/sys/i386/conf/Makefile index 67fff855f985..acf1e11b1fee 100644 --- a/sys/i386/conf/Makefile +++ b/sys/i386/conf/Makefile @@ -3,5 +3,8 @@ all: @echo "make LINT only" +clean: + rm LINT + LINT: NOTES makeLINT.pl perl5 makeLINT.pl < NOTES > LINT diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 75c1783e29e3..567fb47fac81 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -711,6 +711,9 @@ options EXT2FS # inclusion on shell boxes. options VFS_AIO +# Cryptographically secure random number generator; /dev/[u]random +options RANDOMDEV + ##################################################################### # POSIX P1003.1B