mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #124766 - devnexen:getrandom_solarish, r=Mark-Simulacrum

Browse Source 
std::rand: adding solaris/illumos for getrandom support.

To help solarish support for miri https://https://github.com/rust-lang/miri/issues/3567
This commit is contained in:
Matthias Krüger 2024-05-11 08:00:15 +02:00 committed by GitHub
commit f73f266657
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/std/src/sys/pal/unix/rand.rs
View File

@ -59,7 +59,14 @@ mod imp {
unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) } unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) }
} }
#[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "freebsd", netbsd10))] #[cfg(any(
target_os = "espidf",
target_os = "horizon",
target_os = "freebsd",
netbsd10,
target_os = "illumos",
target_os = "solaris"
))]
fn getrandom(buf: &mut [u8]) -> libc::ssize_t { fn getrandom(buf: &mut [u8]) -> libc::ssize_t {
unsafe { libc::getrandom(buf.as_mut_ptr().cast(), buf.len(), 0) } unsafe { libc::getrandom(buf.as_mut_ptr().cast(), buf.len(), 0) }
} }
@ -83,6 +90,8 @@ mod imp {
target_os = "horizon", target_os = "horizon",
target_os = "freebsd", target_os = "freebsd",
target_os = "dragonfly", target_os = "dragonfly",
target_os = "solaris",
target_os = "illumos",
netbsd10 netbsd10
)))] )))]
fn getrandom_fill_bytes(_buf: &mut [u8]) -> bool { fn getrandom_fill_bytes(_buf: &mut [u8]) -> bool {
@ -96,6 +105,8 @@ mod imp {
target_os = "horizon", target_os = "horizon",
target_os = "freebsd", target_os = "freebsd",
target_os = "dragonfly", target_os = "dragonfly",
target_os = "solaris",
target_os = "illumos",
netbsd10 netbsd10
))] ))]
fn getrandom_fill_bytes(v: &mut [u8]) -> bool { fn getrandom_fill_bytes(v: &mut [u8]) -> bool {