mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
add raw test using new syscall
This commit is contained in:
parent
34808beb8f
commit
b99b545ef0
2 changed files with 29 additions and 7 deletions
|
|
@ -11,7 +11,7 @@ utralib = { version = "0.1.24", optional = true, default-features = false, featu
|
||||||
] }
|
] }
|
||||||
xous-names = { package = "xous-api-names", version = "0.9.59" }
|
xous-names = { package = "xous-api-names", version = "0.9.59" }
|
||||||
ticktimer = { package = "xous-api-ticktimer", version = "0.9.57" }
|
ticktimer = { package = "xous-api-ticktimer", version = "0.9.57" }
|
||||||
xous = "0.9.61"
|
xous = { version = "0.9.61", features = ["raw-trng"] }
|
||||||
xous-ipc = "0.9.61"
|
xous-ipc = "0.9.61"
|
||||||
log-server = { package = "xous-api-log", version = "0.1.57" }
|
log-server = { package = "xous-api-log", version = "0.1.57" }
|
||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ pub const TRNG_TEST_BUF_LEN: usize = 2048;
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Trng {
|
pub struct Trng {
|
||||||
csprng: RefCell<rand_chacha::ChaCha8Rng>,
|
csprng: RefCell<rand_chacha::ChaCha8Rng>,
|
||||||
|
mode: api::TrngTestMode,
|
||||||
}
|
}
|
||||||
impl Trng {
|
impl Trng {
|
||||||
pub fn new(_xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
|
pub fn new(_xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
|
||||||
|
|
@ -20,6 +21,7 @@ impl Trng {
|
||||||
(xous::create_server_id().unwrap().to_u32().0 as u64)
|
(xous::create_server_id().unwrap().to_u32().0 as u64)
|
||||||
| ((xous::create_server_id().unwrap().to_u32().0 as u64) << 32),
|
| ((xous::create_server_id().unwrap().to_u32().0 as u64) << 32),
|
||||||
)),
|
)),
|
||||||
|
mode: api::TrngTestMode::Raw,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -76,14 +78,34 @@ impl Trng {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the test mode according to the argument. Blocks until mode is set.
|
/// Sets the test mode according to the argument. Blocks until mode is set.
|
||||||
pub fn set_test_mode(&self, test_mode: api::TrngTestMode) {
|
pub fn set_test_mode(&mut self, test_mode: api::TrngTestMode) { self.mode = test_mode; }
|
||||||
log::info!("TODO: trng test mode setting: {:?}", test_mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Gets test data from the TRNG.
|
/// Gets test data from the TRNG.
|
||||||
pub fn get_test_data(&self) -> Result<[u8; TRNG_TEST_BUF_LEN], xous::Error> {
|
pub fn get_test_data(&mut self) -> Result<[u8; TRNG_TEST_BUF_LEN], xous::Error> {
|
||||||
log::info!("TODO: get test data");
|
match self.mode {
|
||||||
Ok([0u8; TRNG_TEST_BUF_LEN])
|
api::TrngTestMode::None => {
|
||||||
|
let mut buf = [0u8; TRNG_TEST_BUF_LEN];
|
||||||
|
self.fill_bytes(&mut buf);
|
||||||
|
Ok(buf)
|
||||||
|
}
|
||||||
|
api::TrngTestMode::Raw => {
|
||||||
|
let mut buf = [0u8; TRNG_TEST_BUF_LEN];
|
||||||
|
for chunk in buf.chunks_mut(16) {
|
||||||
|
match xous::rsyscall(xous::SysCall::RawTrng(0, 0, 0, 0, 0, 0, 0))
|
||||||
|
.expect("RawTrng syscall failed")
|
||||||
|
{
|
||||||
|
xous::Result::Scalar5(r0, r1, r2, r3, _) => {
|
||||||
|
chunk[..4].copy_from_slice(&(r0 as u32).to_le_bytes());
|
||||||
|
chunk[4..8].copy_from_slice(&(r1 as u32).to_le_bytes());
|
||||||
|
chunk[8..12].copy_from_slice(&(r2 as u32).to_le_bytes());
|
||||||
|
chunk[12..].copy_from_slice(&(r3 as u32).to_le_bytes());
|
||||||
|
}
|
||||||
|
_ => panic!("Bad syscall result"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(buf)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue