d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r346410 and r346411

Browse Source 
libkern in .PATH has too many filename conflicts with libc and my -DNO_CLEAN
tinderbox didn't catch that ahead of time.  Mea culpa.
This commit is contained in:
Conrad Meyer 2019-04-19 22:08:17 +00:00
parent 02babf9221
commit 6b97c2e306
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=346420
7 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libc/gen/Makefile.inc
View File

@ -3,7 +3,6 @@
# machine-independent gen sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
.PATH: ${SRCTOP}/sys/libkern
CONFS= shells

4
sys/libkern/arc4random_uniform.c → lib/libc/gen/arc4random_uniform.c
View File

@ -19,11 +19,7 @@
*/
#include <sys/types.h>
#ifdef _KERNEL
#include <sys/libkern.h>
#else
#include <stdlib.h>
#endif
/*
* Calculate a uniformly distributed random number less than upper_bound

2
share/man/man9/Makefile
View File

@ -1668,8 +1668,6 @@ MLINKS+=psignal.9 gsignal.9 \
psignal.9 tdsignal.9
MLINKS+=random.9 arc4rand.9 \
random.9 arc4random.9 \
random.9 arc4random_buf.9 \
random.9 arc4random_uniform.9 \
random.9 is_random_seeded.9 \
random.9 read_random.9 \
random.9 read_random_uio.9 \

13
share/man/man9/random.9
View File

@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\" "
.Dd April 19, 2019
.Dd April 16, 2019
.Dt RANDOM 9
.Os
.Sh NAME
@ -45,8 +45,6 @@
.Fn arc4random "void"
.Ft void
.Fn arc4random_buf "void *ptr" "size_t len"
.Ft uint32_t
.Fn arc4random_uniform "uint32_t upper_bound"
.Ft void
.Fn arc4rand "void *ptr" "u_int length" "int reseed"
.Pp
@ -82,15 +80,6 @@ with
.Fa len
bytes of random data.
.Pp
.Fn arc4random_uniform
will return a single 32-bit value, uniformly distributed but less than
.Fa upper_bound .
This is recommended over constructions like
.Dq Li arc4random() % upper_bound
as it avoids "modulo bias" when the upper bound is not a power of two.
In the worst case, this function may consume multiple iterations
to ensure uniformity.
.Pp
The
.Fn arc4rand
CSPRNG

1
sys/conf/files
View File

@ -3985,7 +3985,6 @@ kgssapi/gsstest.c optional kgssapi_debug
# the file should be moved to conf/files.<arch> from here.
#
libkern/arc4random.c standard
libkern/arc4random_uniform.c standard
crypto/chacha20/chacha.c standard
libkern/asprintf.c standard
libkern/bcd.c standard

1
sys/sys/libkern.h
View File

@ -128,7 +128,6 @@ struct malloc_type;
uint32_t arc4random(void);
void arc4random_buf(void *, size_t);
void arc4rand(void *, u_int, int);
uint32_t arc4random_uniform(uint32_t);
int timingsafe_bcmp(const void *, const void *, size_t);
void *bsearch(const void *, const void *, size_t,
size_t, int (*)(const void *, const void *));

2
sys/sys/param.h
View File

@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1300021 /* Master, propagated to newvers */
#define __FreeBSD_version 1300020 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,