Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5243 from niacat/kern-arand 

Avoid reading from /dev/urandom on NetBSD
master
Andrew Kelley 2020-05-02 04:16:24 -04:00 committed by GitHub
parent 3dbe02e2d8 74ad315360
commit 428065da30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/std/c/netbsd.zig
View File

@ -9,6 +9,7 @@ pub const _errno = __errno;
pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;
pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;
pub extern "c" fn __stat50(path: [*:0]const u8, buf: *Stat) c_int;
pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;

4
lib/std/os.zig
View File

@ -153,6 +153,10 @@ pub fn getrandom(buffer: []u8) GetRandomError!void {
}
return;
}
if (builtin.os.tag == .netbsd) {
netbsd.arc4random_buf(buffer.ptr, buffer.len);
return;
}
if (builtin.os.tag == .wasi) {
switch (wasi.random_get(buffer.ptr, buffer.len)) {
0 => return,

8
src/os.cpp
View File

@ -1462,6 +1462,14 @@ static void init_rand() {
unsigned seed;
memcpy(&seed, ptr_random, sizeof(seed));
srand(seed);
#elif defined(ZIG_OS_FREEBSD) || defined(ZIG_OS_NETBSD)
unsigned seed;
size_t len = sizeof(seed);
int mib[2] = { CTL_KERN, KERN_ARND };
if (sysctl(mib, 2, &seed, &len, NULL, 0) != 0) {
zig_panic("unable to query random data from sysctl");
}
srand(seed);
#else
int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
if (fd == -1) {