mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
retire the barque BasisRoot encryption mechanism for a much simpler implementation
This commit is contained in:
parent
c62b2a25fb
commit
a5da30de37
2 changed files with 60 additions and 27 deletions
|
|
@ -776,6 +776,43 @@ impl Default for BasisRootName {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* this is retired, but kept around because it's a cool idea that could be useful later.
|
||||||
|
the code below is how the encryptor iterator would be called, followed by the iterator itself.
|
||||||
|
The idea is to create a thing that can chain iterators and generate encrypted blocks. Could
|
||||||
|
be useful for e.g. encrypting long keys and stuff...?
|
||||||
|
|
||||||
|
The code was retired only because we decided to simplify the BasisRoot and it always fits in
|
||||||
|
one page, so all this iterator is just baroque and frankly kind of pointless in that context.
|
||||||
|
|
||||||
|
if let Some(syskey) = self.system_basis_key {
|
||||||
|
let key = Key::from_slice(&syskey);
|
||||||
|
let cipher = Aes256GcmSiv::new(key);
|
||||||
|
let basis_encryptor = BasisEncryptor::new(
|
||||||
|
&basis_root,
|
||||||
|
self.dna,
|
||||||
|
cipher,
|
||||||
|
0,
|
||||||
|
Rc::clone(&self.entropy),
|
||||||
|
);
|
||||||
|
for (&k, &v) in basis_v2p_map.iter() {
|
||||||
|
log::info!("basis_v2p_map retrieved va: {:x?} pp: {:x?}", k, v);
|
||||||
|
}
|
||||||
|
for (vpage_no, ppage_data) in basis_encryptor.into_iter().enumerate() {
|
||||||
|
let vaddr = VirtAddr::new( ((vpage_no + 1) * VPAGE_SIZE) as u64 ).unwrap();
|
||||||
|
match basis_v2p_map.get(&vaddr) {
|
||||||
|
Some(pp) => {
|
||||||
|
self.patch_data(&ppage_data, pp.page_number() * PAGE_SIZE as u32);
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
log::error!("Previously allocated page was not found in our map!");
|
||||||
|
panic!("Inconsistent internal state");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log::error!("System key was not found, but it should be present!");
|
||||||
|
panic!("Inconsistent internal state");
|
||||||
|
}
|
||||||
/// Takes in the constituents of the Basis area, and encrypts them into
|
/// Takes in the constituents of the Basis area, and encrypts them into
|
||||||
/// PAGE_SIZE blocks. Can be called as an iterator, or as a single-shot
|
/// PAGE_SIZE blocks. Can be called as an iterator, or as a single-shot
|
||||||
/// for a given offset. Requires a cipher that is pre-keyed with the encryption
|
/// for a given offset. Requires a cipher that is pre-keyed with the encryption
|
||||||
|
|
@ -877,7 +914,7 @@ impl<'a> Iterator for BasisEncryptorIter<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
/*
|
/*
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
|
|
||||||
|
|
@ -1143,36 +1143,32 @@ impl PddbOs {
|
||||||
basis_v2p_map.insert(va, rpte);
|
basis_v2p_map.insert(va, rpte);
|
||||||
}
|
}
|
||||||
|
|
||||||
// step 8. write the System basis to Flash, at the physical locations noted above. The routine is coded to
|
// step 8. write the System basis to Flash, at the physical locations noted above. This is an extract
|
||||||
// handle many pages, but currently only one is allocated during formatting.
|
// from the basis_sync() method on a BasisCache entry, but because we haven't created a cache entry,
|
||||||
|
// we're copypasta'ing the code here
|
||||||
|
let aad = basis_root.aad(self.dna);
|
||||||
|
let pp = basis_v2p_map.get(&VirtAddr::new(1 * VPAGE_SIZE as u64).unwrap())
|
||||||
|
.expect("Internal consistency error: Basis exists, but its root map was not allocated!");
|
||||||
|
let journal_bytes = (0 as u32).to_le_bytes();
|
||||||
|
let slice_iter =
|
||||||
|
journal_bytes.iter() // journal rev
|
||||||
|
.chain(basis_root.as_ref().iter());
|
||||||
|
let mut block = [0 as u8; VPAGE_SIZE + size_of::<JournalType>()];
|
||||||
|
for (&src, dst) in slice_iter.zip(block.iter_mut()) {
|
||||||
|
*dst = src;
|
||||||
|
}
|
||||||
|
let nonce = self.nonce_gen();
|
||||||
if let Some(syskey) = self.system_basis_key {
|
if let Some(syskey) = self.system_basis_key {
|
||||||
let key = Key::from_slice(&syskey);
|
let key = Key::from_slice(&syskey);
|
||||||
let cipher = Aes256GcmSiv::new(key);
|
let cipher = Aes256GcmSiv::new(key);
|
||||||
let basis_encryptor = BasisEncryptor::new(
|
let ciphertext = cipher.encrypt(
|
||||||
&basis_root,
|
&nonce,
|
||||||
self.dna,
|
Payload {
|
||||||
cipher,
|
aad: &aad,
|
||||||
0,
|
msg: &block,
|
||||||
Rc::clone(&self.entropy),
|
|
||||||
);
|
|
||||||
for (&k, &v) in basis_v2p_map.iter() {
|
|
||||||
log::info!("basis_v2p_map retrieved va: {:x?} pp: {:x?}", k, v);
|
|
||||||
}
|
|
||||||
for (vpage_no, ppage_data) in basis_encryptor.into_iter().enumerate() {
|
|
||||||
let vaddr = VirtAddr::new( ((vpage_no + 1) * VPAGE_SIZE) as u64 ).unwrap();
|
|
||||||
match basis_v2p_map.get(&vaddr) {
|
|
||||||
Some(pp) => {
|
|
||||||
self.patch_data(&ppage_data, pp.page_number() * PAGE_SIZE as u32);
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
log::error!("Previously allocated page was not found in our map!");
|
|
||||||
panic!("Inconsistent internal state");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
).unwrap();
|
||||||
} else {
|
self.patch_data(&[nonce.as_slice(), &ciphertext].concat(), pp.page_number() * PAGE_SIZE as u32);
|
||||||
log::error!("System key was not found, but it should be present!");
|
|
||||||
panic!("Inconsistent internal state");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// step 9. generate & write initial page table entries
|
// step 9. generate & write initial page table entries
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue