mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
add a random seed to the environment
this is randomly genverated on boot and inserted into the environment. it is unique per-PID. This is useful for seeding psuedorandom number generators, especially in environments where syscalls are not possible.
This commit is contained in:
parent
01475137bb
commit
52215251a4
4 changed files with 30 additions and 12 deletions
|
|
@ -40,7 +40,9 @@ xous-pl230 = { path = "../libs/xous-pl230", optional = true, features = [
|
|||
aes-gcm-siv = { version = "0.11.1", default-features = false, features = [
|
||||
"aes",
|
||||
], optional = true }
|
||||
aes = { path = "../services/aes", default-features = false, optional = true }
|
||||
aes = { path = "../services/aes", default-features = false, optional = true, features = [
|
||||
"chaffing",
|
||||
] }
|
||||
crc = { version = "1.8.1", default-features = false }
|
||||
rand_chacha = { version = "0.3.1", optional = true, default-features = false }
|
||||
pio-proc = { version = "0.2.2", optional = true }
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ pub struct EnvHeader {
|
|||
count: u16,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct EnvVariables {
|
||||
count: usize,
|
||||
flattened_vars: Vec<u8>,
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@
|
|||
// -[ ] libs/precursor/hal/src/board/precursors.rs - PDDB_LEN is shortened for vexii-test target
|
||||
|
||||
extern crate alloc;
|
||||
use alloc::vec::Vec;
|
||||
|
||||
#[macro_use]
|
||||
mod args;
|
||||
|
|
@ -433,14 +432,11 @@ fn boot_sequence(
|
|||
env_variables.add_var("UUID", &hex_uuid);
|
||||
}
|
||||
|
||||
let mut env_header = crate::env::EnvHeader::default();
|
||||
let env = env_header.to_bytes(&env_variables);
|
||||
|
||||
// cold boot path
|
||||
println!("No suspend marker found, doing a cold boot!");
|
||||
clear_ram(&mut cfg);
|
||||
phase_1(&mut cfg, detached_app);
|
||||
phase_2(&mut cfg, &env);
|
||||
phase_2(&mut cfg, env_variables);
|
||||
#[cfg(any(feature = "debug-print", feature = "swap"))]
|
||||
if VDBG || SDBG {
|
||||
check_load(&mut cfg);
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ use xous::arch::{SWAP_CFG_VADDR, SWAP_COUNT_VADDR, SWAP_PT_VADDR};
|
|||
|
||||
#[cfg(feature = "swap")]
|
||||
use crate::swap::*;
|
||||
use crate::*;
|
||||
use crate::{env::EnvVariables, *};
|
||||
|
||||
/// Phase 2 bootloader
|
||||
///
|
||||
/// Set up all the page tables, allocating new root page tables for SATPs and corresponding
|
||||
/// sub-pages starting from the base of previously copied process data.
|
||||
pub fn phase_2(cfg: &mut BootConfig, env: &Vec<u8>) {
|
||||
pub fn phase_2(cfg: &mut BootConfig, env_variables: EnvVariables) {
|
||||
let args = cfg.args;
|
||||
|
||||
// This is the offset in RAM where programs are loaded from.
|
||||
|
|
@ -36,18 +36,38 @@ pub fn phase_2(cfg: &mut BootConfig, env: &Vec<u8>) {
|
|||
#[cfg(feature = "atsama5d27")]
|
||||
let mut kernel_irq_sp = 0;
|
||||
|
||||
#[cfg(feature = "bao1x")]
|
||||
let mut trng = bao1x_hal::sce::trng::Trng::new(utralib::generated::HW_TRNG_BASE as usize);
|
||||
#[cfg(feature = "bao1x")]
|
||||
trng.setup_raw_generation(32); // this is safe to call multiple times to affirm the TRNG state
|
||||
|
||||
for tag in args.iter() {
|
||||
let mut env_header = crate::env::EnvHeader::default();
|
||||
let mut pid_env = env_variables.clone();
|
||||
|
||||
#[cfg(feature = "bao1x")]
|
||||
{
|
||||
let mut seed = [0u8; 32];
|
||||
for chunk in seed.chunks_mut(4) {
|
||||
chunk.copy_from_slice(&trng.get_u32().unwrap().to_ne_bytes());
|
||||
}
|
||||
let seed_hex = hex::encode(&seed);
|
||||
pid_env.add_var("SEED", &seed_hex);
|
||||
}
|
||||
|
||||
let env = env_header.to_bytes(&pid_env);
|
||||
|
||||
if tag.name == u32::from_le_bytes(*b"IniE") {
|
||||
let inie = MiniElf::new(&tag);
|
||||
println!("\n\nCopying IniE program into memory");
|
||||
let allocated = inie.load(cfg, process_offset, pid, env, IniType::IniE);
|
||||
let allocated = inie.load(cfg, process_offset, pid, &env, IniType::IniE);
|
||||
println!("IniE Allocated {:x}", allocated);
|
||||
process_offset -= allocated;
|
||||
pid += 1;
|
||||
} else if tag.name == u32::from_le_bytes(*b"IniF") {
|
||||
let inif = MiniElf::new(&tag);
|
||||
println!("\n\nMapping IniF program into memory");
|
||||
let allocated = inif.load(cfg, process_offset, pid, env, IniType::IniF);
|
||||
let allocated = inif.load(cfg, process_offset, pid, &env, IniType::IniF);
|
||||
println!("IniF Allocated {:x}", allocated);
|
||||
process_offset -= allocated;
|
||||
pid += 1;
|
||||
|
|
@ -56,7 +76,7 @@ pub fn phase_2(cfg: &mut BootConfig, env: &Vec<u8>) {
|
|||
{
|
||||
let inis = MiniElf::new(&tag);
|
||||
println!("\n\nMapping IniS program into memory");
|
||||
let allocated = inis.load(cfg, process_offset, pid, env, IniType::IniS);
|
||||
let allocated = inis.load(cfg, process_offset, pid, &env, IniType::IniS);
|
||||
println!("IniS Allocated {:x}", allocated);
|
||||
process_offset -= allocated;
|
||||
pid += 1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue