liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

xfer

Browse Source
This commit is contained in:
Christien Rioux
2023-10-06 16:41:25 -04:00
parent ff56634667
commit 86dee2b6ed
6 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
veilid-core/src/intf/native/protected_store.rs
View File

@@ -41,6 +41,8 @@ impl ProtectedStore {
#[instrument(level = "debug", skip(self), err)]
pub async fn init(&self) -> EyreResult<()> {
log_pstore!(error "ASDFASDFASDF");
let delete = {
let c = self.config.get();
let mut inner = self.inner.lock();
@@ -48,11 +50,19 @@ impl ProtectedStore {
// Attempt to open the secure keyring
cfg_if! {
if #[cfg(target_os = "android")] {
inner.keyring_manager = KeyringManager::new_secure(&c.program_name, crate::intf::android::get_android_globals()).ok();
let maybe_km = KeyringManager::new_secure(&c.program_name, crate::intf::android::get_android_globals());
} else {
inner.keyring_manager = KeyringManager::new_secure(&c.program_name).ok();
let maybe_km = KeyringManager::new_secure(&c.program_name);
}
}
inner.keyring_manager = match maybe_km {
Ok(v) => Some(v),
Err(e) => {
log_pstore!(error "Failed to create secure keyring manager: {}", e);
None
}
};
}
if (c.protected_store.always_use_insecure_storage
|| c.protected_store.allow_insecure_fallback)
@@ -78,6 +88,7 @@ impl ProtectedStore {
);
}
if inner.keyring_manager.is_none() {
log_pstore!(error "QWERQWER");
bail!("Could not initialize the protected store.");
}
c.protected_store.delete