From ac02943a4df338f28713e109cad7148801923c12 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sat, 28 Dec 2013 02:51:08 +0000 Subject: Try to load entropy data from disk:/etc/random.seed, and additionally use a MD-supplied random function. Then, insert this into the ELF openbsd.randomdata of the kernel, so that it has entropy right from the start. Some help from jsing for the softraid aspects. Also tested by phessler --- sys/arch/i386/stand/Makefile.inc | 4 ++-- sys/arch/i386/stand/boot/Makefile | 4 ++-- sys/arch/i386/stand/cdboot/Makefile | 4 ++-- sys/arch/i386/stand/pxeboot/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/arch/i386/stand') diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index e1b447f0243..78fa6d376a5 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.44 2013/01/18 04:10:16 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.45 2013/12/28 02:51:07 deraadt Exp $ CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror -CFLAGS+= -fno-stack-protector +CFLAGS+= -fno-stack-protector -DMDRANDOM CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} SACFLAGS=-D_STANDALONE DEBUGLIBS=no diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index 516e661706a..d8c75948ce0 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2013/06/02 21:01:48 guenther Exp $ +# $OpenBSD: Makefile,v 1.53 2013/12/28 02:51:07 deraadt Exp $ COPTS?= MAN?= boot.8 @@ -32,7 +32,7 @@ SRCS= srt0.S SRCS+= boot.c cmd.c vars.c bootarg.c conf.c .PATH: ${SADIR}/libsa -SRCS+= alloca.S debug_i386.S gidt.S +SRCS+= alloca.S debug_i386.S gidt.S random_i386.S SRCS+= apmprobe.c bioscons.c biosdev.c cmd_i386.c debug.c dev_i386.c \ diskprobe.c exec_i386.c gateA20.c machdep.c memprobe.c pciprobe.c \ ps2probe.c time.c diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index 3909c2d9c02..3457d5e50f0 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2013/06/02 21:01:48 guenther Exp $ +# $OpenBSD: Makefile,v 1.20 2013/12/28 02:51:07 deraadt Exp $ MAN= cdboot.8 @@ -16,7 +16,7 @@ INSTALL_STRIP= CLEANFILES+= crt0.o ${PROG}.whole .PATH: ${SADIR}/libsa -SRCS+= alloca.S debug_i386.S gidt.S +SRCS+= alloca.S debug_i386.S gidt.S random_i386.S SRCS+= cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c SRCS+= apmprobe.c bioscons.c biosdev.c debug.c diskprobe.c memprobe.c \ pciprobe.c ps2probe.c time.c diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile index 83cfd0de5b8..df0ece2ddc0 100644 --- a/sys/arch/i386/stand/pxeboot/Makefile +++ b/sys/arch/i386/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2013/04/23 16:41:13 jsing Exp $ +# $OpenBSD: Makefile,v 1.16 2013/12/28 02:51:07 deraadt Exp $ MAN= pxeboot.8 @@ -16,7 +16,7 @@ INSTALL_STRIP= CLEANFILES+= crt0.o ${PROG}.whole .PATH: ${SADIR}/libsa -SRCS+= alloca.S debug_i386.S gidt.S +SRCS+= alloca.S debug_i386.S gidt.S random_i386.S SRCS+= cmd_i386.c exec_i386.c gateA20.c machdep.c SRCS+= apmprobe.c bioscons.c biosdev.c debug.c diskprobe.c memprobe.c \ pciprobe.c ps2probe.c time.c -- cgit v1.2.3