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

Commit 1c55cb8d authored by Andrew Scull's avatar Andrew Scull Committed by Automerger Merge Worker
Browse files

Merge "Document that the component version can be a string" am: de49fca0 am:... 

Merge "Document that the component version can be a string" am: de49fca0 am: f82e894f am: 35b6a900 am: 37ce42ae

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



Change-Id: Ib0cff049f53ccf249c36b9d05d596ed516608d96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57a0cb07 37ce42ae

security/rkp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -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

      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 component version can now be either an int or a string.

* RpcHardwareInfo

  * `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.

security/rkp/README.md

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ the range \[-70000, -70999\] (these are reserved for future additions here). 
| ----------------- | ------ | ---------- | ----------------------------------|

| Component name    | -70002 | tstr       | Name of firmware component / boot |

:                   :        :            : stage                             :

| Component version | -70003 | int        | Version of firmware component /   |

| Component version | -70003 | int / tstr | Version of firmware component /   |

:                   :        :            : boot stage                        :

| Resettable        | -70004 | null       | If present, key changes on factory|

:                   :        :            : reset                             :

security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ interface IRemotelyProvisionedComponent { 
     *     ? -4670547 : bstr,                       ; Configuration Hash

     *     -4670548 : bstr .cbor {                  ; Configuration Descriptor

     *         ? -70002 : tstr,                         ; Component name

     *         ? -70003 : int,                          ; Firmware version

     *         ? -70003 : int / tstr,                   ; Component version

     *         ? -70004 : null,                         ; Resettable

     *     },

     *     -4670549 : bstr,                         ; Authority Hash