yggdrasil/getrandom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: Use libc::GRND_NONBLOCK (#29)

Browse Source 
We don't need to define this ourself. Introduced in libc 0.2.34:
  See: https://github.com/rust-lang/libc/pull/830
This commit is contained in:
Joseph Richey 2019-06-12 02:48:32 -07:00 committed by Artyom Pavlov
parent ce4a089878
commit 50212bd5ed
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -21,7 +21,7 @@ members = ["tests/wasm_bindgen"]
log = { version = "0.4", optional = true }
[target.'cfg(unix)'.dependencies]
libc = "0.2.29"
libc = "0.2.34"
[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.6", features = ["minwindef", "ntsecapi", "winnt"] }

3
src/linux_android.rs
View File

@ -17,7 +17,6 @@ use core::num::NonZeroU32;
use core::sync::atomic::{AtomicBool, Ordering};
// This flag tells getrandom() to return EAGAIN instead of blocking.
const GRND_NONBLOCK: libc::c_uint = 0x0001;
static RNG_INIT: AtomicBool = AtomicBool::new(false);
enum RngSource {
@ -30,7 +29,7 @@ thread_local!(
);
fn syscall_getrandom(dest: &mut [u8], block: bool) -> Result<(), io::Error> {
let flags = if block { 0 } else { GRND_NONBLOCK };
let flags = if block { 0 } else { libc::GRND_NONBLOCK };
let ret = unsafe {
libc::syscall(libc::SYS_getrandom, dest.as_mut_ptr(), dest.len(), flags)
};