commit 0b51b97a80af920167758cac8193b57c64b71c7e
author Max Bires <jbires@google.com> Thu Feb 03 21:53:41 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 03 21:53:41 2022 +0000
tree 3042176018e397c51793d92f7c8bcdd5400e24c1
parent 7aba6f7c526b15d64bd96f3c0de7b622c4ee4240
parent fbc0db2cd2206ecac8689a80ec60e6354a1c94ac

Fixing spec discrepancy in MacedPublicKey am: fbc0db2cd2

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

Change-Id: I6caa4b986418cd63b1f0b10c8aedaa2615a961bf

security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl

diff --git a/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl
index 62a48e9..ad97443 100644
--- a/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl
+++ b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl
@@ -37,10 +37,10 @@
      *
      *     PublicKey = {               // COSE_Key
      *         1 : 2,                  // Key type : EC2
-     *         3 : -8                  // Algorithm : ES256
-     *         -1 : 6,                 // Curve : P256
-     *         -2 : bstr               // X coordinate, little-endian
-     *         -3 : bstr               // Y coordinate, little-endian
+     *         3 : -7,                 // Algorithm : ES256
+     *         -1 : 1,                 // Curve : P256
+     *         -2 : bstr,              // X coordinate, little-endian
+     *         -3 : bstr,              // Y coordinate, little-endian
      *         ? -70000 : nil          // Presence indicates this is a test key.  If set, K_mac is
      *                                 // all zeros.
      *     },