mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add some debug for the precursor target
This commit is contained in:
parent
8824372101
commit
b5f0c262e7
1 changed files with 21 additions and 4 deletions
|
|
@ -1,8 +1,11 @@
|
||||||
use core::mem::size_of;
|
use core::mem::size_of;
|
||||||
|
use std::fmt::Write;
|
||||||
|
|
||||||
use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, Error, KeyInit, Nonce, Tag};
|
use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, Error, KeyInit, Nonce, Tag};
|
||||||
use loader::swap::{SwapSpec, SWAP_HAL_VADDR};
|
use loader::swap::{SwapSpec, SWAP_HAL_VADDR};
|
||||||
|
|
||||||
|
use crate::debug::DebugUart;
|
||||||
|
|
||||||
pub const PAGE_SIZE: usize = 4096;
|
pub const PAGE_SIZE: usize = 4096;
|
||||||
|
|
||||||
/// This defines a set of functions to get and receive MACs (message
|
/// This defines a set of functions to get and receive MACs (message
|
||||||
|
|
@ -43,7 +46,17 @@ impl SwapHal {
|
||||||
src_vaddr: usize,
|
src_vaddr: usize,
|
||||||
src_pid: u8,
|
src_pid: u8,
|
||||||
) {
|
) {
|
||||||
// println!("enc_to: pid: {}, src_vaddr: {:x} dest_offset: {:x}", src_pid, src_vaddr, dest_offset);
|
/*
|
||||||
|
writeln!(
|
||||||
|
DebugUart {},
|
||||||
|
"enc_to: pid: {}, src_vaddr: {:x} dest_offset: {:x}, buf addr: {:x}",
|
||||||
|
src_pid,
|
||||||
|
src_vaddr,
|
||||||
|
dest_offset,
|
||||||
|
buf.as_ptr() as usize
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
|
*/
|
||||||
assert!(buf.len() == PAGE_SIZE);
|
assert!(buf.len() == PAGE_SIZE);
|
||||||
assert!(dest_offset & (PAGE_SIZE - 1) == 0);
|
assert!(dest_offset & (PAGE_SIZE - 1) == 0);
|
||||||
let mut nonce = [0u8; size_of::<Nonce>()];
|
let mut nonce = [0u8; size_of::<Nonce>()];
|
||||||
|
|
@ -54,15 +67,19 @@ impl SwapHal {
|
||||||
let vpage_masked = src_vaddr & !(PAGE_SIZE - 1);
|
let vpage_masked = src_vaddr & !(PAGE_SIZE - 1);
|
||||||
nonce[9..12].copy_from_slice(&(vpage_masked as u32).to_be_bytes()[..3]);
|
nonce[9..12].copy_from_slice(&(vpage_masked as u32).to_be_bytes()[..3]);
|
||||||
let aad: &[u8] = &[];
|
let aad: &[u8] = &[];
|
||||||
|
writeln!(DebugUart {}, "bef enc: nonce {:x?} aad {:x?} buf {:x?}", &nonce, aad, &buf[..32]).ok();
|
||||||
match self.cipher.encrypt_in_place_detached(Nonce::from_slice(&nonce), aad, buf) {
|
match self.cipher.encrypt_in_place_detached(Nonce::from_slice(&nonce), aad, buf) {
|
||||||
Ok(tag) => {
|
Ok(tag) => {
|
||||||
|
// writeln!(DebugUart {}, "Nonce: {:x?}, tag: {:x?}", &nonce, tag.as_slice()).ok();
|
||||||
self.dst_data_area[dest_offset..dest_offset + PAGE_SIZE].copy_from_slice(buf);
|
self.dst_data_area[dest_offset..dest_offset + PAGE_SIZE].copy_from_slice(buf);
|
||||||
let mac_offset = (dest_offset / PAGE_SIZE) * size_of::<Tag>();
|
let mac_offset = (dest_offset / PAGE_SIZE) * size_of::<Tag>();
|
||||||
self.dst_mac_area[mac_offset..mac_offset + size_of::<Tag>()].copy_from_slice(tag.as_slice());
|
self.dst_mac_area[mac_offset..mac_offset + size_of::<Tag>()].copy_from_slice(tag.as_slice());
|
||||||
// println!("Nonce: {:x?}, tag: {:x?}", &nonce, tag.as_slice());
|
// writeln!(DebugUart {}, "dst_mac_area: {:x?}", &self.dst_mac_area[..32]).ok();
|
||||||
// println!("dst_mac_area: {:x?}", &self.dst_mac_area[..32]);
|
}
|
||||||
|
Err(e) => {
|
||||||
|
writeln!(DebugUart {}, "Encryption error to swap ram: {:?}", e).ok();
|
||||||
|
panic!("Encryption error to swap ram: {:?}", e)
|
||||||
}
|
}
|
||||||
Err(e) => panic!("Encryption error to swap ram: {:?}", e),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue