D36088.1777774578.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36088.1777774578.diff
View Options

	Index: lib/libc/gen/arc4random.c
	===================================================================
	--- lib/libc/gen/arc4random.c
	+++ lib/libc/gen/arc4random.c
	@@ -1,4 +1,4 @@
	-/* $OpenBSD: arc4random.c,v 1.55 2019/03/24 17:56:54 deraadt Exp $ */
	+/* $OpenBSD: arc4random.c,v 1.58 2022/07/31 13:41:45 tb Exp $ */

	/*
	* Copyright (c) 1996, David Mazieres <dm@uun.org>
	@@ -66,6 +66,8 @@
	#define BLOCKSZ 64
	#define RSBUFSZ (16*BLOCKSZ)

	+#define REKEY_BASE (10241024) / NB. should be a power of 2 */
	+
	/* Marked INHERIT_ZERO, so zero'd out in fork children. */
	static struct _rs {
	size_t rs_have; /* valid bytes at end of rs_buf */
	@@ -106,6 +108,7 @@
	_rs_stir(void)
	{
	u_char rnd[KEYSZ + IVSZ];
	+ uint32_t rekey_fuzz = 0;

	#if defined(__FreeBSD__)
	bool need_init;
	@@ -152,7 +155,10 @@
	rs->rs_have = 0;
	memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));

	- rs->rs_count = 1600000;
	+ /* rekey interval should not be predictable */
	+ chacha_encrypt_bytes(&rsx->rs_chacha, (uint8_t *)&rekey_fuzz,
	+ (uint8_t *)&rekey_fuzz, sizeof(rekey_fuzz));
	+ rs->rs_count = REKEY_BASE + (rekey_fuzz % REKEY_BASE);
	}

	static inline void