mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
port getrandom to use flatipc
This commit is contained in:
parent
cbe9aa05be
commit
489c614ec6
2 changed files with 13 additions and 14 deletions
|
|
@ -32,11 +32,11 @@ wasm-bindgen-test = "0.3.18"
|
||||||
[target.'cfg(target_os = "xous")'.dependencies]
|
[target.'cfg(target_os = "xous")'.dependencies]
|
||||||
xous-names = { package = "xous-api-names", version = "0.9.62" }
|
xous-names = { package = "xous-api-names", version = "0.9.62" }
|
||||||
xous = "0.9.64"
|
xous = "0.9.64"
|
||||||
xous-ipc = "0.10.1"
|
|
||||||
rkyv = { version = "0.8.8", default-features = false, features = [
|
rkyv = { version = "0.8.8", default-features = false, features = [
|
||||||
"std",
|
"std",
|
||||||
"alloc",
|
"alloc",
|
||||||
] }
|
] }
|
||||||
|
flatipc = { path = "../../libs/flatipc" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# Implement std-only traits for getrandom::Error
|
# Implement std-only traits for getrandom::Error
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ use core::mem::MaybeUninit;
|
||||||
use core::sync::atomic::AtomicU32;
|
use core::sync::atomic::AtomicU32;
|
||||||
use core::sync::atomic::Ordering;
|
use core::sync::atomic::Ordering;
|
||||||
|
|
||||||
use xous_ipc::Buffer;
|
use flatipc::{IntoIpc, Ipc};
|
||||||
|
|
||||||
/// Fill `dest` with random bytes from the system's preferred random number
|
/// Fill `dest` with random bytes from the system's preferred random number
|
||||||
/// source.
|
/// source.
|
||||||
|
|
@ -21,9 +21,10 @@ use crate::util::slice_as_uninit;
|
||||||
|
|
||||||
static TRNG_CONN: AtomicU32 = AtomicU32::new(0);
|
static TRNG_CONN: AtomicU32 = AtomicU32::new(0);
|
||||||
|
|
||||||
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
|
#[derive(Debug, flatipc::Ipc)]
|
||||||
|
#[repr(C)]
|
||||||
struct TrngBuf {
|
struct TrngBuf {
|
||||||
pub data: [u32; 1024],
|
pub data: [u32; 1020],
|
||||||
pub len: u16,
|
pub len: u16,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -47,15 +48,14 @@ pub fn getrandom_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), crate::error:
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn fill_buf(data: &mut [u32]) {
|
pub fn fill_buf(data: &mut [u32]) {
|
||||||
let mut tb = TrngBuf { data: [0; 1024], len: 0 };
|
let mut tb = TrngBuf { data: [0; 1020], len: 0 };
|
||||||
assert!(data.len() <= tb.data.len());
|
assert!(data.len() <= tb.data.len());
|
||||||
tb.len = data.len() as u16;
|
tb.len = data.len() as u16;
|
||||||
let mut buf = Buffer::into_buf(tb).unwrap();
|
let mut buf = tb.into_ipc();
|
||||||
buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap();
|
buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap();
|
||||||
let rtb = buf.as_flat::<TrngBuf, _>().unwrap();
|
assert!(usize::from(buf.len) == data.len());
|
||||||
assert!(usize::from(rtb.len) == data.len());
|
let len = buf.len as usize;
|
||||||
// FIXME
|
data.copy_from_slice(&buf.data[..len]);
|
||||||
// data.copy_from_slice(&rtb.data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn next_u32() -> u32 {
|
pub fn next_u32() -> u32 {
|
||||||
|
|
@ -119,19 +119,18 @@ fn fill_bytes(dest: &mut [MaybeUninit<u8>]) {
|
||||||
// initializing the empty 4k-page...
|
// initializing the empty 4k-page...
|
||||||
let remainder = dest.chunks_exact_mut(4096).into_remainder();
|
let remainder = dest.chunks_exact_mut(4096).into_remainder();
|
||||||
if remainder.len() != 0 {
|
if remainder.len() != 0 {
|
||||||
let mut tb = TrngBuf { data: [0; 1024], len: 0 };
|
let mut tb = TrngBuf { data: [0; 1020], len: 0 };
|
||||||
tb.len = if remainder.len() % 4 == 0 {
|
tb.len = if remainder.len() % 4 == 0 {
|
||||||
(remainder.len() / 4) as u16
|
(remainder.len() / 4) as u16
|
||||||
} else {
|
} else {
|
||||||
1 + (remainder.len() / 4) as u16
|
1 + (remainder.len() / 4) as u16
|
||||||
};
|
};
|
||||||
let mut buf = Buffer::into_buf(tb).unwrap();
|
let mut buf = tb.into_ipc();
|
||||||
buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap();
|
buf.lend_mut(TRNG_CONN.load(Ordering::SeqCst), 1 /* FillTrng */).unwrap();
|
||||||
let rtb = buf.as_flat::<TrngBuf, _>().unwrap();
|
|
||||||
|
|
||||||
// transform the whole buffer into a ret_u8 slice (including trailing zeroes)
|
// transform the whole buffer into a ret_u8 slice (including trailing zeroes)
|
||||||
let ret_u8 =
|
let ret_u8 =
|
||||||
unsafe { core::slice::from_raw_parts(rtb.data.as_ptr() as *mut u8, rtb.data.len() * 4) };
|
unsafe { core::slice::from_raw_parts(buf.data.as_ptr() as *mut u8, buf.data.len() * 4) };
|
||||||
// we've allocated an extra remainder word to handle the last word overflow, if anything
|
// we've allocated an extra remainder word to handle the last word overflow, if anything
|
||||||
// we'll end up throwing away a couple of unused bytes, but better than copying zeroes!
|
// we'll end up throwing away a couple of unused bytes, but better than copying zeroes!
|
||||||
remainder.copy_from_slice(slice_as_uninit(&ret_u8[..remainder.len()]));
|
remainder.copy_from_slice(slice_as_uninit(&ret_u8[..remainder.len()]));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue