diff --git a/services/pddb/src/backend/hw.rs b/services/pddb/src/backend/hw.rs index 1af6e61c4..dc0f2e55b 100644 --- a/services/pddb/src/backend/hw.rs +++ b/services/pddb/src/backend/hw.rs @@ -10,8 +10,8 @@ use std::collections::HashSet; use std::convert::TryInto; use std::io::{Error, ErrorKind, Result}; -use aes::cipher::{generic_array::GenericArray, BlockDecrypt, BlockEncrypt}; -use aes::{Aes256, Block, BLOCK_SIZE}; +use aes::cipher::{BlockDecrypt, BlockEncrypt, generic_array::GenericArray}; +use aes::{Aes256, BLOCK_SIZE, Block}; use aes_gcm_siv::aead::{Aead, Payload}; use aes_gcm_siv::{Aes256GcmSiv, Nonce, Tag}; use backend::bcrypt::*; @@ -2503,16 +2503,13 @@ impl PddbOs { let aad_local = self.data_aad(&name); self.dna_mode = DnaMode::Migration; let aad_incoming = self.data_aad(&name); - keymap.insert( - &name, - MigrationCiphers { - pt_ecb, - data_gcm_siv, - aad_incoming, - aad_local, - data_key: basis_keys.data.into(), - }, - ); + keymap.insert(&name, MigrationCiphers { + pt_ecb, + data_gcm_siv, + aad_incoming, + aad_local, + data_key: basis_keys.data.into(), + }); modals.update_progress(index as u32 + 1).ok(); } @@ -2828,14 +2825,11 @@ impl PddbOs { self.tt.sleep_ms(SWAP_DELAY_MS).unwrap(); } // done! - if self.yes_no_approval( - &modals, - match self.dna_mode { - DnaMode::Normal => t!("pddb.freespace.finished", locales::LANG), - DnaMode::Migration => t!("pddb.rekey.finished", locales::LANG), - DnaMode::Churn => t!("pddb.churn.finished", locales::LANG), - }, - ) { + if self.yes_no_approval(&modals, match self.dna_mode { + DnaMode::Normal => t!("pddb.freespace.finished", locales::LANG), + DnaMode::Migration => t!("pddb.rekey.finished", locales::LANG), + DnaMode::Churn => t!("pddb.churn.finished", locales::LANG), + }) { Some(ret) } else { None @@ -3457,7 +3451,7 @@ impl PddbOs { // derive old and new keys let basis_key_v1 = self.basis_derive_key_v00_00_01_01( bname.first().as_str(), - pw.as_str().unwrap_or("UTF8-error"), + pw.as_str(), &scd, ); let basis_aad_v1 = data_aad_v1(&self, bname.first().as_str());