commit | 9581a6d4290f8699c162ce0e74f4a2bde47f81ec | [log] [tgz] |
---|---|---|
author | Andrew Scull <ascull@google.com> | Wed May 17 01:22:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 17 01:22:23 2023 +0000 |
tree | 54701f19b02242db9f3054bcc29d201032dbdc7f | |
parent | 28c83cec1662ebd5c36c6dcae3f9f55ba051a1a8 [diff] | |
parent | d49d16a7f3f3f20d1c86243f69462aedc9ade7ea [diff] |
Merge "Require the config hash" am: 122b4986d4 am: a45d765922 am: e204f73890 am: d49d16a7f3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587808 Change-Id: I962faa323b9361c6cab7bec0a9bf4011fa1a2b23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl index 7fed363..b231dae 100644 --- a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl +++ b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
@@ -422,7 +422,7 @@ * ; described above. * -4670545 : bstr, ; Code Hash * ? -4670546 : bstr, ; Code Descriptor - * ? -4670547 : bstr, ; Configuration Hash + * -4670547 : bstr, ; Configuration Hash * -4670548 : bstr .cbor { ; Configuration Descriptor * ? -70002 : tstr, ; Component name * ? -70003 : int / tstr, ; Component version