From fe937af1aaa05a211e0af67d52c2ced0e944b9f5 Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Thu, 31 Dec 2020 09:14:26 +0800 Subject: [PATCH] MA-18508 Sync keymaster bootloader commands ID AOSP adds command 'KM_CLEAR_ATTESTATION_CERT_CHAIN' to clear the attestation cert chain, but its ID will conflict with 'KM_SET_ATTESTATION_KEY_ENC'. This commit will reorder the keymaster commands to avoid conflicts. Test: ID attestation provision. Change-Id: I0046b5bee4e0ffea3bdcff31859452da53d8e50d Signed-off-by: Ji Luo (cherry picked from commit e19aa1c26047dc719e7561695100dac807925ae7) (cherry picked from commit b9a1bcaea22da0491df322b36740d7498e39cd38) --- include/interface/keymaster/keymaster.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/interface/keymaster/keymaster.h b/include/interface/keymaster/keymaster.h index 928854e890..b094d40a41 100644 --- a/include/interface/keymaster/keymaster.h +++ b/include/interface/keymaster/keymaster.h @@ -63,11 +63,11 @@ enum keymaster_command { KM_ATAP_SET_CA_RESPONSE_FINISH = (0x7000 << KEYMASTER_REQ_SHIFT), KM_ATAP_READ_UUID = (0x8000 << KEYMASTER_REQ_SHIFT), KM_SET_PRODUCT_ID = (0x9000 << KEYMASTER_REQ_SHIFT), - KM_SET_ATTESTATION_KEY_ENC = (0xa000 << KEYMASTER_REQ_SHIFT), - KM_APPEND_ATTESTATION_CERT_CHAIN_ENC = (0xb000 << KEYMASTER_REQ_SHIFT), - KM_GET_MPPUBK = (0xc000 << KEYMASTER_REQ_SHIFT), - KM_VERIFY_SECURE_UNLOCK = (0xd000 << KEYMASTER_REQ_SHIFT), - KM_APPEND_ATTESTATION_ID = (0xe000 << KEYMASTER_REQ_SHIFT) + KM_GET_MPPUBK = (0xb000 << KEYMASTER_REQ_SHIFT), + KM_APPEND_ATTESTATION_CERT_CHAIN_ENC = (0xc000 << KEYMASTER_REQ_SHIFT), + KM_SET_ATTESTATION_KEY_ENC = (0xd000 << KEYMASTER_REQ_SHIFT), + KM_VERIFY_SECURE_UNLOCK = (0xe000 << KEYMASTER_REQ_SHIFT), + KM_APPEND_ATTESTATION_ID = (0xf000 << KEYMASTER_REQ_SHIFT) }; typedef enum { -- 2.17.1