commit c12212b6a6f83d855e1f51a17493923d3b94d902
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 02 21:14:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 02 21:14:56 2022 +0000
tree aff39d4ee34b7b35c7e366989171b4caf7d96711
parent 290bf4d72bca66633a91ba67d31eb3d30f49ffdd
parent f2e823e672282494ace77d5d0002408bbe48bab0

Merge "Remove 'ops' field from BCC public keys." am: fefa4986db am: f2e823e672

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

Change-Id: I0987f4b0a8699f03c9162c480f1ddbb3ca00c8a3

security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl

diff --git a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
index 24cdbc1..a14fc88 100644
--- a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
+++ b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl
@@ -169,7 +169,6 @@
      *     PubKeyEd25519 = {                // COSE_Key
      *         1 : 1,                         // Key type : octet key pair
      *         3 : AlgorithmEdDSA,            // Algorithm : EdDSA
-     *         4 : 2,                         // Ops: Verify
      *         -1 : 6,                        // Curve : Ed25519
      *         -2 : bstr                      // X coordinate, little-endian
      *     }
@@ -184,7 +183,6 @@
      *     PubKeyECDSA256 = {                 // COSE_Key
      *         1 : 2,                         // Key type : EC2
      *         3 : AlgorithmES256,            // Algorithm : ECDSA w/ SHA-256
-     *         4 : 2,                         // Ops: Verify
      *         -1 : 1,                        // Curve: P256
      *         -2 : bstr,                     // X coordinate
      *         -3 : bstr                      // Y coordinate