[Secretkeeper] In-memory KeyValueStore am: 2759df0d3c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2847554

Change-Id: I74a1740c9591b763dacf099f02e977091f9df75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shikha Panwar 2023-12-12 14:54:39 +00:00 committed by Automerger Merge Worker
commit 5c86cf8553
3 changed files with 49 additions and 7 deletions

View file

@ -35,6 +35,7 @@ rust_binary {
"libauthgraph_hal",
"libbinder_rs",
"liblog_rust",
"libsecretkeeper_comm_nostd",
"libsecretkeeper_core_nostd",
"libsecretkeeper_hal",
],

View file

@ -15,17 +15,21 @@
*/
//! Non-secure implementation of the Secretkeeper HAL.
mod store;
use log::{error, info, Level};
use std::sync::{Arc, Mutex};
use authgraph_boringssl as boring;
use authgraph_core::ta::{Role, AuthGraphTa};
use authgraph_core::keyexchange::{MAX_OPENED_SESSIONS, AuthGraphParticipant};
use authgraph_core::keyexchange::{AuthGraphParticipant, MAX_OPENED_SESSIONS};
use authgraph_core::ta::{AuthGraphTa, Role};
use authgraph_hal::channel::SerializedChannel;
use log::{error, info, Level};
use secretkeeper_core::ta::SecretkeeperTa;
use secretkeeper_hal::SecretkeeperService;
use authgraph_hal::channel::SerializedChannel;
use std::sync::Arc;
use std::sync::Mutex;
use store::InMemoryStore;
use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::ISecretkeeper::{
ISecretkeeper, BpSecretkeeper,
BpSecretkeeper, ISecretkeeper,
};
use std::cell::RefCell;
use std::rc::Rc;
@ -53,8 +57,9 @@ impl LocalTa {
// The TA code expects to run single threaded, so spawn a thread to run it in.
std::thread::spawn(move || {
let mut crypto_impls = boring::crypto_trait_impls();
let storage_impl = Box::new(InMemoryStore::default());
let sk_ta = Rc::new(RefCell::new(
SecretkeeperTa::new(&mut crypto_impls)
SecretkeeperTa::new(&mut crypto_impls, storage_impl)
.expect("Failed to create local Secretkeeper TA"),
));
let mut ag_ta = AuthGraphTa::new(

View file

@ -0,0 +1,36 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
use secretkeeper_comm::data_types::error::Error;
use secretkeeper_core::store::KeyValueStore;
use std::collections::HashMap;
/// An in-memory implementation of KeyValueStore. Please note that this is entirely for
/// testing purposes. Refer to the documentation of `PolicyGatedStorage` & Secretkeeper HAL for
/// persistence requirements.
#[derive(Default)]
pub struct InMemoryStore(HashMap<Vec<u8>, Vec<u8>>);
impl KeyValueStore for InMemoryStore {
fn store(&mut self, key: &[u8], val: &[u8]) -> Result<(), Error> {
// This will overwrite the value if key is already present.
let _ = self.0.insert(key.to_vec(), val.to_vec());
Ok(())
}
fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error> {
let optional_val = self.0.get(key);
Ok(optional_val.cloned())
}
}