diff options
| author | Shaquille Johnson <ssjohnson@google.com> | 2023-03-09 17:37:08 +0000 |
|---|---|---|
| committer | Shaquille Johnson <ssjohnson@google.com> | 2023-04-27 12:21:22 +0000 |
| commit | bbbe5d5441a88ff9ca2a3fbee480ee079d642d46 (patch) | |
| tree | e71c51826ab4ea03f44fb7a73cadbd2acd1af469 /keystore2/src/fuzzers | |
| parent | 53e956493e6b37f2f817661d857d961cd646f27c (diff) | |
| download | security-bbbe5d5441a88ff9ca2a3fbee480ee079d642d46.tar.gz | |
Edit hidl instances to remove vintf
This uses the getAllHalInstanceNames method to replace calls
to vintf and return the hal names to the code. Other callers
to this function will not need to change their inputs.
Test: atest keystore2_test && atest CtsKeystoreTestCases
Bug: 249096262
Change-Id: If23cf8ca4b9d1c8cb3675964475066728bfe789f
Diffstat (limited to 'keystore2/src/fuzzers')
| -rw-r--r-- | keystore2/src/fuzzers/Android.bp | 4 | ||||
| -rw-r--r-- | keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keystore2/src/fuzzers/Android.bp b/keystore2/src/fuzzers/Android.bp index 4ac83e3b..9f3e104c 100644 --- a/keystore2/src/fuzzers/Android.bp +++ b/keystore2/src/fuzzers/Android.bp @@ -23,7 +23,7 @@ rust_fuzz { "libbinder_rs", "libkeystore2", "libkeystore2_crypto_rust", - "libkeystore2_vintf_rust", + "libkeystore2_hal_names_rust", "libkeystore2_aaid-rust", "libkeystore2_apc_compat-rust", "libkeystore2_selinux", @@ -46,7 +46,7 @@ rust_fuzz { rustlibs: [ "libkeystore2", "libkeystore2_crypto_rust", - "libkeystore2_vintf_rust", + "libkeystore2_hal_names_rust", "libkeystore2_aaid-rust", "libkeystore2_apc_compat-rust", "libkeystore2_selinux", diff --git a/keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs b/keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs index 0dca3a24..b8259cf0 100644 --- a/keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs +++ b/keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs @@ -26,8 +26,8 @@ use keystore2_crypto::{ ec_point_point_to_oct, ecdh_compute_key, generate_random_data, hkdf_expand, hkdf_extract, hmac_sha256, parse_subject_from_certificate, Password, ZVec, }; +use keystore2_hal_names::get_hidl_instances; use keystore2_selinux::{check_access, getpidcon, setcon, Backend, Context, KeystoreKeyBackend}; -use keystore2_vintf::get_hidl_instances; use libfuzzer_sys::{arbitrary::Arbitrary, fuzz_target}; use std::{ffi::CString, sync::Arc}; |