| commit | 8a262b2975cad3f2a4d998f0d139430fe906f861 | [log] [tgz] |
|---|---|---|
| author | Shikha Panwar <shikhapanwar@google.com> | Fri Jan 12 11:15:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 12 11:15:40 2024 +0000 |
| tree | 8fc98b7546483ad696d3f5e61869017aa73d2dd6 | |
| parent | 66b8d373e40d14f898ff2ed03f131ba2d86a8929 [diff] | |
| parent | 62b6504c33f6bfe46cffbcb7b24ba47fad3925f4 [diff] |
Merge "InitialPayload of ExplicitKeyDiceCertChain" into main am: 62b6504c33 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2906515 Change-Id: I2d04780a1be9207b539fd4a76d96542cbd987d49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/authgraph/aidl/android/hardware/security/authgraph/ExplicitKeyDiceCertChain.cddl b/security/authgraph/aidl/android/hardware/security/authgraph/ExplicitKeyDiceCertChain.cddl index 3de5617..2d6c696 100644 --- a/security/authgraph/aidl/android/hardware/security/authgraph/ExplicitKeyDiceCertChain.cddl +++ b/security/authgraph/aidl/android/hardware/security/authgraph/ExplicitKeyDiceCertChain.cddl
@@ -19,11 +19,10 @@ * DiceChainEntry ] -DiceCertChainInitialPayload = { - -4670552 : bstr .cbor PubKeyEd25519 / - bstr .cbor PubKeyECDSA256 / - bstr .cbor PubKeyECDSA384 ; subjectPublicKey -} +; Encoded in accordance with Core Deterministic Encoding Requirements [RFC 8949 s4.2.1] +DiceCertChainInitialPayload = bstr .cbor PubKeyEd25519 + / bstr .cbor PubKeyECDSA256 + / bstr .cbor PubKeyECDSA384 ; subjectPublicKey ; INCLUDE generateCertificateRequestV2.cddl for: PubKeyEd25519, PubKeyECDSA256, PubKeyECDSA384, ; DiceChainEntry