Skip to content

Make rekey interval less predictable #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make rekey interval less predictable #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion gen/FreeBSD/arc4random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ _arc4_fork_child(void)
#else /* __APPLE__ && !VARIANT_STATIC */

#define RANDOMDEV "/dev/random"
#define REKEY_BASE (1024*1024) /* NB. should be a power of 2 */

static void
_my_getentropy(uint8_t *buf, size_t size){
Expand Down Expand Up @@ -226,10 +227,13 @@ arc4_fetch(void)
static os_unfair_lock arc4_lock = OS_UNFAIR_LOCK_INIT;
static int arc4_count;

static inline u_int32_t
arc4_getword(void)
static void
arc4_stir(void)
{
int n;
u_int32_t rekey_fuzz;
/*
* If we don't have data, we need some now before we can integrate
* it into the static buffers
Expand All @@ -252,7 +256,10 @@ arc4_stir(void)
*/
for (n = 0; n < 1024; n++)
(void) arc4_getbyte();
arc4_count = 1600000;

rekey_fuzz = arc4_getword();
/* rekey interval should not be predictable */
arc4_count = REKEY_BASE + (rekey_fuzz % REKEY_BASE);
rs_stired = 1;
}

Expand Down