Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "AuthGraph VTS: detect additional errors" into main am: f4cb6de19c

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

Change-Id: I7c2bc33984ec60f6864461de36cae3ed885640d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale
2023-11-22 06:32:13 +00:00
committed by Automerger Merge Worker
parent 33da1770e1 f4cb6de19c
commit 853507e554
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
security/authgraph/aidl/vts/functional/Android.bp
View File

@@ -50,6 +50,7 @@ cc_test {
rust_test { rust_test {
name: "VtsAidlAuthGraphRoleTest", name: "VtsAidlAuthGraphRoleTest",
srcs: ["role_test.rs"], srcs: ["role_test.rs"],
require_root: true,
test_suites: [ test_suites: [
"general-tests", "general-tests",
"vts", "vts",

7
security/authgraph/aidl/vts/functional/role_test.rs
View File

@@ -22,13 +22,18 @@ use authgraph_vts_test as vts;
use android_hardware_security_authgraph::aidl::android::hardware::security::authgraph::{ use android_hardware_security_authgraph::aidl::android::hardware::security::authgraph::{
IAuthGraphKeyExchange::IAuthGraphKeyExchange, IAuthGraphKeyExchange::IAuthGraphKeyExchange,
}; };
use binder::StatusCode;
const AUTH_GRAPH_NONSECURE: &str = const AUTH_GRAPH_NONSECURE: &str =
"android.hardware.security.authgraph.IAuthGraphKeyExchange/nonsecure"; "android.hardware.security.authgraph.IAuthGraphKeyExchange/nonsecure";
/// Retrieve the /nonsecure instance of AuthGraph, which supports both sink and source roles. /// Retrieve the /nonsecure instance of AuthGraph, which supports both sink and source roles.
fn get_nonsecure() -> Option<binder::Strong<dyn IAuthGraphKeyExchange>> { fn get_nonsecure() -> Option<binder::Strong<dyn IAuthGraphKeyExchange>> {
binder::get_interface(AUTH_GRAPH_NONSECURE).ok() match binder::get_interface(AUTH_GRAPH_NONSECURE) {
Ok(ag) => Some(ag),
Err(StatusCode::NAME_NOT_FOUND) => None,
Err(e) => panic!("failed to get AuthGraph/nonsecure: {e:?}"),
}
} }
/// Macro to require availability of a /nonsecure instance of AuthGraph. /// Macro to require availability of a /nonsecure instance of AuthGraph.

12
security/authgraph/aidl/vts/functional/source.rs
View File

@@ -250,9 +250,13 @@ pub fn test_corrupt_key(
&corrupt_key, &corrupt_key,
); );
let err = result.expect_err("expect failure with corrupt signature"); let err = result.expect_err("expect failure with corrupt key");
assert_eq!( assert!(
err, err == binder::Status::new_service_specific_error(Error::INVALID_KE_KEY.0, None)
binder::Status::new_service_specific_error(Error::INVALID_PRIV_KEY_ARC_IN_KEY.0, None) || err
== binder::Status::new_service_specific_error(
Error::INVALID_PRIV_KEY_ARC_IN_KEY.0,
None
)
); );
} }