From fbc0db2cd2206ecac8689a80ec60e6354a1c94ac Mon Sep 17 00:00:00 2001 From: Max Bires Date: Thu, 3 Feb 2022 10:40:55 -0800 Subject: [PATCH] Fixing spec discrepancy in MacedPublicKey The algorithm choice was listed as -8 for ES256, when it should be -7. Fixes: 217691766 Test: Everyone harmoniously agrees by +2'ing. Change-Id: I7f73efff42ee6d2b3bfb94b74c1208170805b870 --- .../android/hardware/security/keymint/MacedPublicKey.aidl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl index 62a48e9f55..ad97443666 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 @@ parcelable MacedPublicKey { * * 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. * },