tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix errors from rustc 1.71.0" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-07-13 05:24:19 +00:00 committed by Gerrit Code Review
commit 60021566d5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keystore2/src/apc.rs
View file

@ -244,7 +244,7 @@ impl ApcManager {
// If cancelled by the user or if aborted by the client. // If cancelled by the user or if aborted by the client.
(ResponseCode::CANCELLED, _, _) | (ResponseCode::ABORTED, true, _) => { (ResponseCode::CANCELLED, _, _) | (ResponseCode::ABORTED, true, _) => {
// Penalize. // Penalize.
let mut rate_info = state.rate_limiting.entry(uid).or_default(); let rate_info = state.rate_limiting.entry(uid).or_default();
rate_info.counter += 1; rate_info.counter += 1;
rate_info.timestamp = start; rate_info.timestamp = start;
} }

2
keystore2/src/entropy.rs
View file

@ -29,7 +29,7 @@ struct FeederInfo {
/// Register the entropy feeder as an idle callback. /// Register the entropy feeder as an idle callback.
pub fn register_feeder() { pub fn register_feeder() {
crate::globals::ASYNC_TASK.add_idle(|shelf| { crate::globals::ASYNC_TASK.add_idle(|shelf| {
let mut info = shelf.get_mut::<FeederInfo>(); let info = shelf.get_mut::<FeederInfo>();
let now = Instant::now(); let now = Instant::now();
let feed_needed = match info.last_feed { let feed_needed = match info.last_feed {
None => true, None => true,

4
keystore2/src/super_key.rs
View file

@ -823,7 +823,7 @@ impl SuperKeyManager {
unlocking_sids: &[i64], unlocking_sids: &[i64],
) { ) {
log::info!("Locking screen bound for user {} sids {:?}", user_id, unlocking_sids); log::info!("Locking screen bound for user {} sids {:?}", user_id, unlocking_sids);
let mut entry = self.data.user_keys.entry(user_id).or_default(); let entry = self.data.user_keys.entry(user_id).or_default();
if !unlocking_sids.is_empty() { if !unlocking_sids.is_empty() {
if let (Some(aes), Some(ecdh)) = ( if let (Some(aes), Some(ecdh)) = (
entry.screen_lock_bound.as_ref().cloned(), entry.screen_lock_bound.as_ref().cloned(),
@ -899,7 +899,7 @@ impl SuperKeyManager {
db: &mut KeystoreDB, db: &mut KeystoreDB,
user_id: UserId, user_id: UserId,
) -> Result<()> { ) -> Result<()> {
let mut entry = self.data.user_keys.entry(user_id).or_default(); let entry = self.data.user_keys.entry(user_id).or_default();
if let Some(biometric) = entry.biometric_unlock.as_ref() { if let Some(biometric) = entry.biometric_unlock.as_ref() {
let (key_id_guard, key_entry) = db let (key_id_guard, key_entry) = db
.load_key_entry( .load_key_entry(