summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-11-01 20:54:53 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-11-01 20:54:53 +0000
commitcef5ebe64baa3f846ee7b4636948f1f8dff0e0ec (patch)
treea77186876bf8b6caaf6a91c441bcfa333e67ccc5
parentba9304435455245109a5f26da380520221752796 (diff)
Reduce BOOTRANDOM_MAX to 256. naddy pointed out there's no point having
it larger than RC4STATE. A long discussion ensued. In conclusion all entropy inputs are either satisfactory enough, or just as shitty at 512.
-rw-r--r--sys/arch/octeon/stand/rdboot/rdboot.c4
-rw-r--r--sys/lib/libsa/stand.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/octeon/stand/rdboot/rdboot.c b/sys/arch/octeon/stand/rdboot/rdboot.c
index 023dba11af1..cc4ed59ff4b 100644
--- a/sys/arch/octeon/stand/rdboot/rdboot.c
+++ b/sys/arch/octeon/stand/rdboot/rdboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdboot.c,v 1.2 2019/10/29 02:55:52 deraadt Exp $ */
+/* $OpenBSD: rdboot.c,v 1.3 2019/11/01 20:54:52 deraadt Exp $ */
/*
* Copyright (c) 2019 Visa Hankala
@@ -41,7 +41,7 @@
#define DEVRANDOM "/dev/random"
#define BOOTRANDOM "/etc/random.seed"
-#define BOOTRANDOM_MAX 512
+#define BOOTRANDOM_MAX 256 /* no point being greater than RC4STATE */
#define KERNEL "/bsd"
void loadrandom(void);
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index d4b56fd1331..5cc9034fdec 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stand.h,v 1.67 2019/08/03 15:22:17 deraadt Exp $ */
+/* $OpenBSD: stand.h,v 1.68 2019/11/01 20:54:52 deraadt Exp $ */
/* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */
/*-
@@ -132,7 +132,7 @@ char *getdisklabel(const char *, struct disklabel *);
u_int dkcksum(const struct disklabel *);
#define BOOTRANDOM "/etc/random.seed"
-#define BOOTRANDOM_MAX 512
+#define BOOTRANDOM_MAX 256 /* no point being greater than RC4STATE */
extern char rnddata[BOOTRANDOM_MAX];
void printf(const char *, ...);