T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use getrandom for random_get, disable default rand features (#625)

Browse Source 
* use getrandom, disable default rand features
This commit is contained in:
Artyom Pavlov
2019-11-25 23:01:09 +00:00
committed by Dan Gohman
parent 64f9cee842
commit 752ed901d6
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/wasi-common/src/hostcalls_impl/misc.rs
View File

@@ -4,7 +4,7 @@ use crate::fdentry::Descriptor;
use crate::memory::*;
use crate::sys::hostcalls_impl;
use crate::{wasi, wasi32, Error, Result};
use log::trace;
use log::{error, trace};
use std::convert::TryFrom;
pub(crate) fn args_get(
@@ -132,15 +132,14 @@ pub(crate) fn random_get(
buf_ptr: wasi32::uintptr_t,
buf_len: wasi32::size_t,
) -> Result<()> {
use rand::{thread_rng, RngCore};
trace!("random_get(buf_ptr={:#x?}, buf_len={:?})", buf_ptr, buf_len);
let buf = dec_slice_of_mut_u8(memory, buf_ptr, buf_len)?;
thread_rng().fill_bytes(buf);
Ok(())
getrandom::getrandom(buf).map_err(|err| {
error!("getrandom failure: {:?}", err);
Error::EIO
})
}
pub(crate) fn clock_res_get(

11
crates/wasi-common/src/old/snapshot_0/hostcalls_impl/misc.rs
View File

@@ -4,7 +4,7 @@ use crate::old::snapshot_0::fdentry::Descriptor;
use crate::old::snapshot_0::memory::*;
use crate::old::snapshot_0::sys::hostcalls_impl;
use crate::old::snapshot_0::{wasi, wasi32, Error, Result};
use log::trace;
use log::{error, trace};
use std::convert::TryFrom;
pub(crate) fn args_get(
@@ -132,15 +132,14 @@ pub(crate) fn random_get(
buf_ptr: wasi32::uintptr_t,
buf_len: wasi32::size_t,
) -> Result<()> {
use rand::{thread_rng, RngCore};
trace!("random_get(buf_ptr={:#x?}, buf_len={:?})", buf_ptr, buf_len);
let buf = dec_slice_of_mut_u8(memory, buf_ptr, buf_len)?;
thread_rng().fill_bytes(buf);
Ok(())
getrandom::getrandom(buf).map_err(|err| {
error!("getrandom failure: {:?}", err);
Error::EIO
})
}
pub(crate) fn clock_res_get(