diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2020-10-12 10:42:14 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2020-10-12 10:42:14 +0000 |
| commit | c2ca066705263c5ac375a33df16f109cdb320106 (patch) | |
| tree | 8dcf8b0e15e080a710207e46ce5fd5b7190ab010 /lib/libc/gen | |
| parent | c50f409c15ef818baf5ee49edd52f44b9d809dce (diff) | |
Notes
Diffstat (limited to 'lib/libc/gen')
| -rw-r--r-- | lib/libc/gen/arc4random.c | 5 | ||||
| -rw-r--r-- | lib/libc/gen/arc4random.h | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c index dcadd5e29b2d7..aecbdb8911bd0 100644 --- a/lib/libc/gen/arc4random.c +++ b/lib/libc/gen/arc4random.c @@ -46,6 +46,11 @@ __FBSDID("$FreeBSD$"); #define CHACHA_EMBED #define KEYSTREAM_ONLY +#if defined(__FreeBSD__) +#define ARC4RANDOM_FXRNG 1 +#else +#define ARC4RANDOM_FXRNG 0 +#endif #include "chacha.c" #define minimum(a, b) ((a) < (b) ? (a) : (b)) diff --git a/lib/libc/gen/arc4random.h b/lib/libc/gen/arc4random.h index 79d9704d67de3..459fcc7f6e1dd 100644 --- a/lib/libc/gen/arc4random.h +++ b/lib/libc/gen/arc4random.h @@ -27,9 +27,11 @@ #include <sys/elf.h> #include <sys/endian.h> #include <sys/mman.h> +#if ARC4RANDOM_FXRNG != 0 #include <sys/time.h> /* for sys/vdso.h only. */ #include <sys/vdso.h> #include <machine/atomic.h> +#endif #include <err.h> #include <errno.h> @@ -37,6 +39,7 @@ #include <stdbool.h> #include <stdint.h> +#if ARC4RANDOM_FXRNG != 0 /* * The kernel root seed version is a 64-bit counter, but we truncate it to a * 32-bit value in userspace for the convenience of 32-bit platforms. 32-bit @@ -51,6 +54,7 @@ */ #define fxrng_load_acq_generation(x) atomic_load_acq_32(x) static struct vdso_fxrng_generation_1 *vdso_fxrngp; +#endif static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_LOCK() \ @@ -74,6 +78,7 @@ _getentropy_fail(void) static inline void _rs_initialize_fxrng(void) { +#if ARC4RANDOM_FXRNG != 0 struct vdso_fxrng_generation_1 *fxrngp; int error; @@ -91,6 +96,7 @@ _rs_initialize_fxrng(void) return; vdso_fxrngp = fxrngp; +#endif } static inline int @@ -131,13 +137,14 @@ _rs_forkdetect(void) /* Detect fork (minherit(2) INHERIT_ZERO). */ if (__predict_false(rs == NULL || rsx == NULL)) return; +#if ARC4RANDOM_FXRNG != 0 /* If present, detect kernel FenestrasX seed version change. */ if (vdso_fxrngp == NULL) return; if (__predict_true(rsx->rs_seed_generation == fxrng_load_acq_generation(&vdso_fxrngp->fx_generation32))) return; - +#endif /* Invalidate rs_buf to force "stir" (reseed). */ memset(rs, 0, sizeof(*rs)); } |