| commit | 1166b150fa4ec80447ece5c88781ffcac69e101c | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Fri Dec 22 11:03:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 22 11:03:36 2023 +0000 |
| tree | 8e7a09f36899bad52f91b1df0db06786624b9181 | |
| parent | 2396540021d121c2828fa5635a2673797493d5df [diff] | |
| parent | a105a9b907cfd57067a513ed77841994cb2bf5c3 [diff] |
Merge "Secretkeeper: Use byte[64] as SecretId" into main am: 5f20ea7b01 am: a105a9b907 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2888966 Change-Id: I800b08c63bf3d8a0a1c535f8ff990a6cfeb1bdbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/secretkeeper/aidl/aidl_api/android.hardware.security.secretkeeper/current/android/hardware/security/secretkeeper/SecretId.aidl b/security/secretkeeper/aidl/aidl_api/android.hardware.security.secretkeeper/current/android/hardware/security/secretkeeper/SecretId.aidl index 87d0233..9887066 100644 --- a/security/secretkeeper/aidl/aidl_api/android.hardware.security.secretkeeper/current/android/hardware/security/secretkeeper/SecretId.aidl +++ b/security/secretkeeper/aidl/aidl_api/android.hardware.security.secretkeeper/current/android/hardware/security/secretkeeper/SecretId.aidl
@@ -35,5 +35,5 @@ /* @hide */ @VintfStability parcelable SecretId { - byte[] id; + byte[64] id; }
diff --git a/security/secretkeeper/aidl/android/hardware/security/secretkeeper/SecretId.aidl b/security/secretkeeper/aidl/android/hardware/security/secretkeeper/SecretId.aidl index bd982e7..b17917f 100644 --- a/security/secretkeeper/aidl/android/hardware/security/secretkeeper/SecretId.aidl +++ b/security/secretkeeper/aidl/android/hardware/security/secretkeeper/SecretId.aidl
@@ -25,5 +25,5 @@ /** * 64-byte identifier for a secret. */ - byte[] id; + byte[64] id; }
diff --git a/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs b/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs index 5d1306a..994f581 100644 --- a/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs +++ b/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs
@@ -233,7 +233,7 @@ fn delete(&self, ids: &[&Id]) { let ids: Vec<SecretId> = ids .iter() - .map(|id| SecretId { id: id.0.to_vec() }) + .map(|id| SecretId { id: id.0 }) .collect(); self.sk.deleteIds(&ids).unwrap(); }