Merge "Document that the component version can be a string" am: de49fca027 am: f82e894f01 am: 35b6a90035

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

Change-Id: I2c535f073f752bc145d8a8f8770b23a5bfa0962d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrew Scull 2023-04-07 22:53:13 +00:00 committed by Automerger Merge Worker
commit 37ce42ae95
3 changed files with 3 additions and 2 deletions

View file

@ -42,6 +42,7 @@ This document provides an exact description of which changes have occurred in th
`AuthenticatedRequest<T>` object representing the top level data required to authenticate `AuthenticatedRequest<T>` object representing the top level data required to authenticate
the data provided in the payload, `T`. the data provided in the payload, `T`.
* The new CSR format supports P-384 signing keys and SHA-384 hashes in the DICE chain. * The new CSR format supports P-384 signing keys and SHA-384 hashes in the DICE chain.
* The component version can now be either an int or a string.
* RpcHardwareInfo * RpcHardwareInfo
* `supportedNumKeysInCsr` added to report the maximum number of keys supported in a CSR. * `supportedNumKeysInCsr` added to report the maximum number of keys supported in a CSR.
* `supportedEekCurve` is no longer used, due to the removal of the EEK from the scheme. * `supportedEekCurve` is no longer used, due to the removal of the EEK from the scheme.

View file

@ -302,7 +302,7 @@ the range \[-70000, -70999\] (these are reserved for future additions here).
| ----------------- | ------ | ---------- | ----------------------------------| | ----------------- | ------ | ---------- | ----------------------------------|
| Component name | -70002 | tstr | Name of firmware component / boot | | Component name | -70002 | tstr | Name of firmware component / boot |
: : : : stage : : : : : stage :
| Component version | -70003 | int | Version of firmware component / | | Component version | -70003 | int / tstr | Version of firmware component / |
: : : : boot stage : : : : : boot stage :
| Resettable | -70004 | null | If present, key changes on factory| | Resettable | -70004 | null | If present, key changes on factory|
: : : : reset : : : : : reset :

View file

@ -421,7 +421,7 @@ interface IRemotelyProvisionedComponent {
* ? -4670547 : bstr, ; Configuration Hash * ? -4670547 : bstr, ; Configuration Hash
* -4670548 : bstr .cbor { ; Configuration Descriptor * -4670548 : bstr .cbor { ; Configuration Descriptor
* ? -70002 : tstr, ; Component name * ? -70002 : tstr, ; Component name
* ? -70003 : int, ; Firmware version * ? -70003 : int / tstr, ; Component version
* ? -70004 : null, ; Resettable * ? -70004 : null, ; Resettable
* }, * },
* -4670549 : bstr, ; Authority Hash * -4670549 : bstr, ; Authority Hash