mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
bring PDDB to AES 0.8 compatibility
This commit is contained in:
parent
9bf431a232
commit
2cd4e80d9c
2 changed files with 3 additions and 2 deletions
|
|
@ -139,7 +139,7 @@ use std::convert::TryInto;
|
|||
use aes_gcm_siv::{Aes256GcmSiv, Key};
|
||||
use aes_gcm_siv::aead::NewAead;
|
||||
use aes::Aes256;
|
||||
use aes::cipher::{NewBlockCipher, generic_array::GenericArray};
|
||||
use aes::cipher::{KeyInit, generic_array::GenericArray};
|
||||
use std::iter::IntoIterator;
|
||||
use std::collections::{BinaryHeap, HashMap, HashSet};
|
||||
use std::io::{Result, Error, ErrorKind};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use crate::*;
|
|||
use aes_gcm_siv::{Aes256GcmSiv, Nonce, Key, Tag};
|
||||
use aes_gcm_siv::aead::{Aead, NewAead, Payload};
|
||||
use aes::{Aes256, Block, BLOCK_SIZE};
|
||||
use aes::cipher::{BlockDecrypt, BlockEncrypt, NewBlockCipher, generic_array::GenericArray};
|
||||
use aes::cipher::{BlockDecrypt, BlockEncrypt, KeyInit, generic_array::GenericArray};
|
||||
use root_keys::api::AesRootkeyType;
|
||||
use spinor::SPINOR_BULK_ERASE_SIZE;
|
||||
use subtle::ConstantTimeEq;
|
||||
|
|
@ -1438,6 +1438,7 @@ impl PddbOs {
|
|||
/// The number of servers that can connect to the Spinor crate is strictly tracked, so we borrow a reference
|
||||
/// to the Spinor object allocated to the PDDB implementation for this operation.
|
||||
pub(crate) fn pddb_format(&mut self, fast: bool, progress: Option<&modals::Modals>) -> Result<()> {
|
||||
use cipher::BlockDecrypt;
|
||||
if !self.rootkeys.is_initialized().unwrap() {
|
||||
return Err(Error::new(ErrorKind::Unsupported, "Root keys are not initialized; cannot format a PDDB without root keys!"));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue