Merge "Fix VtsHalAudioCoreTargetTest test case error" into main
diff --git a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
index 21c5315..00112b1 100644
--- a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
+++ b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
@@ -54,8 +54,12 @@
* use by the IRemotelyProvisionedComponent.
*
* The root keypair is generated by immutable code (e.g. ROM), from a Unique Device Secret (UDS).
- * The keypair that is generated from it can be referred to as the UDS_Pub/UDS_Priv keys. After the
- * device-unique secret is used, it must be made unavailable to any later boot stage.
+ * The UDS is a hardware-bound secret that forms the root of identify for the device and code
+ * running on the device. The keypair generated from the UDS is referred to as the UDS_Pub/UDS_Priv
+ * keypair. After the device-unique secret is used, it must be made unavailable to any later boot
+ * stage. Refer to the
+ * [Open Profile for DICE ](https://pigweed.googlesource.com/open-dice/+/HEAD/docs/specification.md#uds-details)
+ * specification for more details on the UDS.
*
* In this way, booting the device incrementally builds a certificate chain that (a) identifies and
* validates the integrity of every stage and (b) contains a set of public keys that correspond to
@@ -95,8 +99,8 @@
*
* 2) The CDI_Leaf_Priv key cannot be used to sign arbitrary data.
*
- * 3) Backend infrastructure does not correlate UDS_Pub with the certificates signed and sent back
- * to the device.
+ * 3) Backend infrastructure very closely guards access to UDS_Pub, limiting it to the minimum
+ * set of services that need to know it for security, privacy, and counter-abuse purposes.
*
* Versioning
* ==========
diff --git a/security/see/hwcrypto/aidl/vts/functional/Android.bp b/security/see/hwcrypto/aidl/vts/functional/Android.bp
index beb8976..52c7feb 100644
--- a/security/see/hwcrypto/aidl/vts/functional/Android.bp
+++ b/security/see/hwcrypto/aidl/vts/functional/Android.bp
@@ -29,11 +29,6 @@
"librpcbinder_rs",
"librustutils",
],
- arch: {
- x86_64: {
- enabled: true,
- },
- },
}
rust_library {
@@ -62,22 +57,3 @@
"libclap",
],
}
-
-rust_test {
- name: "VtsAidlHwCryptoConnTest",
- srcs: ["connection_test.rs"],
- require_root: true,
- defaults: [
- "hw_crypto_hal_aidl_rust_defaults",
- ],
- rustlibs: [
- "libhwcryptohal_vts_test",
- ],
- data: [
- ":trusty_test_vm_elf",
- ":trusty_test_vm_config",
- ":trusty_vm_launcher_sh",
- ":trusty_wait_ready_sh",
- ":wait_hw_crypto",
- ],
-}