Merge "DICE: Use fixed sized arrays for fixed sized fields." am: 9bea46c467
am: 6c960c53c0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1923382 Change-Id: Ie7ad019762f3b67e25b0509a6eef4a0516ec6f78
This commit is contained in:
commit
31a02c0416
4 changed files with 12 additions and 12 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue