diff options
Diffstat (limited to 'security/dice')
5 files changed, 16 insertions, 12 deletions
diff --git a/security/dice/aidl/Android.bp b/security/dice/aidl/Android.bp index af9dd33c3b..01bc91e5eb 100644 --- a/security/dice/aidl/Android.bp +++ b/security/dice/aidl/Android.bp @@ -41,6 +41,10 @@ aidl_interface { }, rust: { enabled: true, + apex_available: [ + "//apex_available:platform", + "com.android.compos", + ], }, }, // versions: ["1"], diff --git a/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/BccHandover.aidl b/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/BccHandover.aidl index ab50c369a7..8baca94ce8 100644 --- a/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/BccHandover.aidl +++ b/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/BccHandover.aidl @@ -35,7 +35,7 @@ package android.hardware.security.dice; /* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable BccHandover { - byte[] cdiAttest; - byte[] cdiSeal; + byte[32] cdiAttest; + byte[32] cdiSeal; android.hardware.security.dice.Bcc bcc; } diff --git a/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/InputValues.aidl b/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/InputValues.aidl index 79583fbb98..e43c4292e4 100644 --- a/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/InputValues.aidl +++ b/security/dice/aidl/aidl_api/android.hardware.security.dice/current/android/hardware/security/dice/InputValues.aidl @@ -35,10 +35,10 @@ package android.hardware.security.dice; /* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable InputValues { - byte[] codeHash; + byte[64] codeHash; android.hardware.security.dice.Config config; - byte[] authorityHash; + byte[64] authorityHash; @nullable byte[] authorityDescriptor; android.hardware.security.dice.Mode mode = android.hardware.security.dice.Mode.NOT_INITIALIZED; - byte[] hidden; + byte[64] hidden; } diff --git a/security/dice/aidl/android/hardware/security/dice/BccHandover.aidl b/security/dice/aidl/android/hardware/security/dice/BccHandover.aidl index d522cef7a4..6ca862cdf9 100644 --- a/security/dice/aidl/android/hardware/security/dice/BccHandover.aidl +++ b/security/dice/aidl/android/hardware/security/dice/BccHandover.aidl @@ -27,13 +27,13 @@ import android.hardware.security.dice.Bcc; @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) parcelable BccHandover { /** - * CDI_attest. Must a exactly 32 bytes of data. + * CDI_attest. Must be exactly 32 bytes of data. */ - byte[] cdiAttest; + byte[32] cdiAttest; /** - * CDI_seal. Must a exactly 32 bytes of data. + * CDI_seal. Must be exactly 32 bytes of data. */ - byte[] cdiSeal; + byte[32] cdiSeal; /** * CBOR encoded BCC. * diff --git a/security/dice/aidl/android/hardware/security/dice/InputValues.aidl b/security/dice/aidl/android/hardware/security/dice/InputValues.aidl index e44ef22365..711d5232c5 100644 --- a/security/dice/aidl/android/hardware/security/dice/InputValues.aidl +++ b/security/dice/aidl/android/hardware/security/dice/InputValues.aidl @@ -34,7 +34,7 @@ parcelable InputValues { /** * The target code hash. Must be exactly 64 bytes. */ - byte[] codeHash; + byte[64] codeHash; /** * The configuration data. */ @@ -42,7 +42,7 @@ parcelable InputValues { /** * The authority hash. Must be exactly 64 bytes. Must be all zero if unused. */ - byte[] authorityHash; + byte[64] authorityHash; /** * Optional free form authorityDescriptor. */ @@ -54,5 +54,5 @@ parcelable InputValues { /** * Optional hidden values. Must be exactly 64 bytes. Must be all zero if unused. */ - byte[] hidden; + byte[64] hidden; } |