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

Merge "Secretkeeper VTS: Use trait CborSerializable" into main

Browse source
This commit is contained in:
Shikha Panwar 2023-12-08 14:56:47 +00:00 committed by Gerrit Code Review
commit 0b0895a49b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
security/secretkeeper/aidl/vts/Android.bp
View file

@ -29,6 +29,7 @@ rust_test {
"libsecretkeeper_comm_nostd", "libsecretkeeper_comm_nostd",
"android.hardware.security.secretkeeper-V1-rust", "android.hardware.security.secretkeeper-V1-rust",
"libauthgraph_core", "libauthgraph_core",
"libcoset",
"libauthgraph_vts_test", "libauthgraph_vts_test",
"libbinder_rs", "libbinder_rs",
"liblog_rust", "liblog_rust",

11
security/secretkeeper/aidl/vts/secretkeeper_test_client.rs
View file

@ -16,6 +16,7 @@
#[cfg(test)] #[cfg(test)]
use binder::StatusCode; use binder::StatusCode;
use coset::CborSerializable;
use log::warn; use log::warn;
use secretkeeper_comm::data_types::error::SecretkeeperError; use secretkeeper_comm::data_types::error::SecretkeeperError;
use secretkeeper_comm::data_types::request::Request; use secretkeeper_comm::data_types::request::Request;
@ -110,7 +111,7 @@ fn secret_management_get_version() {
}; };
let request = GetVersionRequest {}; let request = GetVersionRequest {};
let request_packet = request.serialize_to_packet(); let request_packet = request.serialize_to_packet();
let request_bytes = request_packet.into_bytes().unwrap(); let request_bytes = request_packet.to_vec().unwrap();
// TODO(b/291224769) The request will need to be encrypted & response need to be decrypted // TODO(b/291224769) The request will need to be encrypted & response need to be decrypted
// with key & related artifacts pre-shared via Authgraph Key Exchange HAL. // with key & related artifacts pre-shared via Authgraph Key Exchange HAL.
@ -119,14 +120,14 @@ fn secret_management_get_version() {
.processSecretManagementRequest(&request_bytes) .processSecretManagementRequest(&request_bytes)
.unwrap(); .unwrap();
let response_packet = ResponsePacket::from_bytes(&response_bytes).unwrap(); let response_packet = ResponsePacket::from_slice(&response_bytes).unwrap();
assert_eq!( assert_eq!(
response_packet.response_type().unwrap(), response_packet.response_type().unwrap(),
ResponseType::Success ResponseType::Success
); );
let get_version_response = let get_version_response =
*GetVersionResponse::deserialize_from_packet(response_packet).unwrap(); *GetVersionResponse::deserialize_from_packet(response_packet).unwrap();
assert_eq!(get_version_response.version(), CURRENT_VERSION); assert_eq!(get_version_response.version, CURRENT_VERSION);
} }
#[test] #[test]
@ -140,7 +141,7 @@ fn secret_management_malformed_request() {
}; };
let request = GetVersionRequest {}; let request = GetVersionRequest {};
let request_packet = request.serialize_to_packet(); let request_packet = request.serialize_to_packet();
let mut request_bytes = request_packet.into_bytes().unwrap(); let mut request_bytes = request_packet.to_vec().unwrap();
// Deform the request // Deform the request
request_bytes[0] = !request_bytes[0]; request_bytes[0] = !request_bytes[0];
@ -152,7 +153,7 @@ fn secret_management_malformed_request() {
.processSecretManagementRequest(&request_bytes) .processSecretManagementRequest(&request_bytes)
.unwrap(); .unwrap();
let response_packet = ResponsePacket::from_bytes(&response_bytes).unwrap(); let response_packet = ResponsePacket::from_slice(&response_bytes).unwrap();
assert_eq!( assert_eq!(
response_packet.response_type().unwrap(), response_packet.response_type().unwrap(),
ResponseType::Error ResponseType::Error