commit e8826e5f685aae66a9adc62f0c99eb8f676460b0
author Paul Crowley <paulcrowley@google.com> Wed Mar 31 08:33:53 2021 -0700
committer Paul Crowley <paulcrowley@google.com> Fri Apr 02 16:09:32 2021 -0700
tree fe4de8303a4bd1ee78ccee102ed5d0721ee991e5
parent 80ca190d33203d60aaf94ecda337127c313f7fea

Refactors in advance of crypto-secure boot level

Various refactors that set the stage for a future change to make
max-boot-level keys cryptographically secure.

Bug: 176450483
Test: keystore2_test
Change-Id: I4e4e91ae23991131610c7a40f6d347ddcd528ac7

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index 174a928..6a07716 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -3025,7 +3025,7 @@
     where
         F: Fn(&Uuid, &[u8]) -> Result<()> + Send + 'static,
     {
-        let super_key = Arc::new(SuperKeyManager::new());
+        let super_key: Arc<SuperKeyManager> = Default::default();
 
         let gc_db = KeystoreDB::new(path, None).expect("Failed to open test gc db_connection.");
         let gc = Gc::new_init_with(Default::default(), move || (Box::new(cb), gc_db, super_key));