Merge "Update ProtectedData DKCertChain to use X.509" am: e003ed061b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2089226
Change-Id: I2402a4c6fe80770c6159ebf171cb195a5bb80812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
index 6db58f2..8b3875b 100644
--- a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
+++ b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
@@ -100,15 +100,13 @@
* SignerName = tstr
*
* DKCertChain = [
- * 2* Certificate // Root -> ... -> Leaf. "Root" is the vendor self-signed
+ * 2* X509Certificate // Root -> ... -> Leaf. "Root" is the vendor self-signed
* // cert, "Leaf" contains DK_pub. There may also be
* // intermediate certificates between Root and Leaf.
* ]
*
- * // Certificates may be either:
- * // 1. COSE_Sign1, with payload containing PubKeyEd25519 or PubKeyECDSA256
- * // 2. a bstr containing a DER-encoded X.509 certificate (RSA, NIST P-curve, or edDSA)
- * Certificate = COSE_Sign1 / bstr
+ * // A bstr containing a DER-encoded X.509 certificate (RSA, NIST P-curve, or edDSA)
+ * X509Certificate = bstr
*
* // The SignedMac, which authenticates the MAC key that is used to authenticate the
* // keysToSign.