Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14bf215d authored by Shikha Panwar's avatar Shikha Panwar Committed by Automerger Merge Worker
Browse files

Merge "Secretkeeper: Use byte[64] as SecretId" into main am: 5f20ea7b am:... 

Merge "Secretkeeper: Use byte[64] as SecretId" into main am: 5f20ea7b am: a105a9b9 am: 1166b150

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



Change-Id: I6756a029be0f8758762ee454ceab91c48c8a3733
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd8f15af 1166b150

security/secretkeeper/aidl/aidl_api/android.hardware.security.secretkeeper/current/android/hardware/security/secretkeeper/SecretId.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ package android.hardware.security.secretkeeper; 
/* @hide */

@VintfStability

parcelable SecretId {

  byte[] id;

  byte[64] id;

}

security/secretkeeper/aidl/android/hardware/security/secretkeeper/SecretId.aidl

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ parcelable SecretId { 
    /**

     * 64-byte identifier for a secret.

     */

    byte[] id;

    byte[64] id;

}

security/secretkeeper/aidl/vts/secretkeeper_test_client.rs

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ impl SkClient { 
    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();

    }