feat(intel): support ECDSA SHA-2 Data Signature Verification
This command support ECC based signature verification on a blob. Supported ECC algorithm are NISP P-256, NISP P-384, Brainpool 256 and Brainpool 384. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com> Signed-off-by: Boon Khai Ng <boon.khai.ng@intel.com> Signed-off-by: Sieu Mun Tang <sieu.mun.tang@intel.com> Change-Id: I7f43d2a69bbe6693ec1bb90f32b817cf00f9f5ae
This commit is contained in:
parent
07912da1b7
commit
583050607e
|
@ -79,6 +79,7 @@
|
|||
|
||||
#define FCS_ECDSA_GET_PUBKEY_MAX_WORD_SIZE 5U
|
||||
#define FCS_ECDSA_SHA2_DATA_SIGN_CMD_MAX_WORD_SIZE 7U
|
||||
#define FCS_ECDSA_SHA2_DATA_SIG_VERIFY_CMD_MAX_WORD_SIZE 43U
|
||||
/* FCS Payload Structure */
|
||||
typedef struct fcs_rng_payload_t {
|
||||
uint32_t session_id;
|
||||
|
@ -246,6 +247,16 @@ int intel_fcs_ecdsa_sha2_data_sign_finalize(uint32_t session_id,
|
|||
uint32_t src_size, uint64_t dst_addr,
|
||||
uint32_t *dst_size, uint32_t *mbox_error);
|
||||
|
||||
int intel_fcs_ecdsa_sha2_data_sig_verify_init(uint32_t session_id,
|
||||
uint32_t context_id, uint32_t key_id,
|
||||
uint32_t param_size, uint64_t param_data,
|
||||
uint32_t *mbox_error);
|
||||
int intel_fcs_ecdsa_sha2_data_sig_verify_finalize(uint32_t session_id,
|
||||
uint32_t context_id, uint32_t src_addr,
|
||||
uint32_t src_size, uint64_t dst_addr,
|
||||
uint32_t *dst_size, uint32_t data_size,
|
||||
uint32_t *mbox_error);
|
||||
|
||||
int intel_fcs_ecdsa_get_pubkey_init(uint32_t session_id, uint32_t context_id,
|
||||
uint32_t key_id, uint32_t param_size,
|
||||
uint64_t param_data, uint32_t *mbox_error);
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
#define MBOX_FCS_GET_DIGEST_REQ 0x82
|
||||
#define MBOX_FCS_MAC_VERIFY_REQ 0x83
|
||||
#define MBOX_FCS_ECDSA_SHA2_DATA_SIGN_REQ 0x85
|
||||
#define MBOX_FCS_ECDSA_SHA2_DATA_SIGN_VERIFY 0x87
|
||||
#define MBOX_FCS_ECDSA_GET_PUBKEY 0x88
|
||||
#define MBOX_FCS_OPEN_CS_SESSION 0xA0
|
||||
#define MBOX_FCS_CLOSE_CS_SESSION 0xA1
|
||||
|
|
|
@ -61,13 +61,10 @@
|
|||
#define INTEL_SIP_SMC_ECC_DBE 0xC200000D
|
||||
|
||||
/* Generic Command */
|
||||
#define INTEL_SIP_SMC_HPS_SET_BRIDGES 0xC2000032
|
||||
#define INTEL_SIP_SMC_GET_ROM_PATCH_SHA384 0xC2000040
|
||||
|
||||
/* Send Mailbox Command */
|
||||
#define INTEL_SIP_SMC_MBOX_SEND_CMD 0xC200001E
|
||||
#define INTEL_SIP_SMC_FIRMWARE_VERSION 0xC200001F
|
||||
#define INTEL_SIP_SMC_HPS_SET_BRIDGES 0xC2000032
|
||||
#define INTEL_SIP_SMC_GET_ROM_PATCH_SHA384 0xC2000040
|
||||
|
||||
#define SERVICE_COMPLETED_MODE_ASYNC 0x00004F4E
|
||||
|
||||
|
@ -102,6 +99,8 @@
|
|||
#define INTEL_SIP_SMC_FCS_MAC_VERIFY_FINALIZE 0xC200007C
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIGN_INIT 0xC2000080
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIGN_FINALIZE 0xC2000082
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIG_VERIFY_INIT 0xC2000086
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIG_VERIFY_FINALIZE 0xC2000088
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_GET_PUBKEY_INIT 0xC2000089
|
||||
#define INTEL_SIP_SMC_FCS_ECDSA_GET_PUBKEY_FINALIZE 0xC200008B
|
||||
|
||||
|
@ -109,6 +108,7 @@
|
|||
#define INTEL_SIP_SMC_FCS_DIGEST_SIZE_MASK 0xF
|
||||
#define INTEL_SIP_SMC_FCS_DIGEST_SIZE_OFFSET 4U
|
||||
#define INTEL_SIP_SMC_FCS_ECC_ALGO_MASK 0xF
|
||||
|
||||
/* ECC DBE */
|
||||
#define WARM_RESET_WFI_FLAG BIT(31)
|
||||
#define SYSMGR_ECC_DBE_COLD_RST_MASK (SYSMGR_ECC_OCRAM_MASK |\
|
||||
|
|
|
@ -15,8 +15,9 @@
|
|||
static fcs_crypto_service_aes_data fcs_aes_init_payload;
|
||||
static fcs_crypto_service_data fcs_sha_get_digest_param;
|
||||
static fcs_crypto_service_data fcs_sha_mac_verify_param;
|
||||
static fcs_crypto_service_data fcs_ecdsa_get_pubkey_param;
|
||||
static fcs_crypto_service_data fcs_sha2_data_sign_param;
|
||||
static fcs_crypto_service_data fcs_sha2_data_sig_verify_param;
|
||||
static fcs_crypto_service_data fcs_ecdsa_get_pubkey_param;
|
||||
|
||||
bool is_size_4_bytes_aligned(uint32_t size)
|
||||
{
|
||||
|
@ -1101,6 +1102,102 @@ int intel_fcs_ecdsa_sha2_data_sign_finalize(uint32_t session_id,
|
|||
return INTEL_SIP_SMC_STATUS_OK;
|
||||
}
|
||||
|
||||
int intel_fcs_ecdsa_sha2_data_sig_verify_init(uint32_t session_id,
|
||||
uint32_t context_id, uint32_t key_id,
|
||||
uint32_t param_size, uint64_t param_data,
|
||||
uint32_t *mbox_error)
|
||||
{
|
||||
return intel_fcs_crypto_service_init(session_id, context_id,
|
||||
key_id, param_size, param_data,
|
||||
(void *) &fcs_sha2_data_sig_verify_param,
|
||||
mbox_error);
|
||||
}
|
||||
|
||||
int intel_fcs_ecdsa_sha2_data_sig_verify_finalize(uint32_t session_id,
|
||||
uint32_t context_id, uint32_t src_addr,
|
||||
uint32_t src_size, uint64_t dst_addr,
|
||||
uint32_t *dst_size, uint32_t data_size,
|
||||
uint32_t *mbox_error)
|
||||
{
|
||||
int status;
|
||||
uint32_t i;
|
||||
uint32_t payload[FCS_ECDSA_SHA2_DATA_SIG_VERIFY_CMD_MAX_WORD_SIZE] = {0U};
|
||||
uint32_t resp_len = *dst_size / MBOX_WORD_BYTE;
|
||||
uintptr_t sig_pubkey_offset;
|
||||
|
||||
if ((dst_size == NULL) || (mbox_error == NULL)) {
|
||||
return INTEL_SIP_SMC_STATUS_REJECTED;
|
||||
}
|
||||
|
||||
if (fcs_sha2_data_sig_verify_param.session_id != session_id ||
|
||||
fcs_sha2_data_sig_verify_param.context_id != context_id) {
|
||||
return INTEL_SIP_SMC_STATUS_REJECTED;
|
||||
}
|
||||
|
||||
if (!is_size_4_bytes_aligned(src_size)) {
|
||||
return INTEL_SIP_SMC_STATUS_REJECTED;
|
||||
}
|
||||
|
||||
if (!is_8_bytes_aligned(data_size) ||
|
||||
!is_8_bytes_aligned(src_addr)) {
|
||||
return INTEL_SIP_SMC_STATUS_REJECTED;
|
||||
}
|
||||
|
||||
if (!is_address_in_ddr_range(src_addr, src_size) ||
|
||||
!is_address_in_ddr_range(dst_addr, *dst_size)) {
|
||||
return INTEL_SIP_SMC_STATUS_REJECTED;
|
||||
}
|
||||
|
||||
/* Prepare command payload */
|
||||
/* Crypto header */
|
||||
i = 0;
|
||||
payload[i] = fcs_sha2_data_sig_verify_param.session_id;
|
||||
i++;
|
||||
payload[i] = fcs_sha2_data_sig_verify_param.context_id;
|
||||
i++;
|
||||
|
||||
payload[i] = fcs_sha2_data_sig_verify_param.crypto_param_size
|
||||
& FCS_CS_FIELD_SIZE_MASK;
|
||||
payload[i] |= (FCS_CS_FIELD_FLAG_INIT | FCS_CS_FIELD_FLAG_UPDATE
|
||||
| FCS_CS_FIELD_FLAG_FINALIZE)
|
||||
<< FCS_CS_FIELD_FLAG_OFFSET;
|
||||
i++;
|
||||
payload[i] = fcs_sha2_data_sig_verify_param.key_id;
|
||||
i++;
|
||||
/* Crypto parameters */
|
||||
payload[i] = fcs_sha2_data_sig_verify_param.crypto_param
|
||||
& INTEL_SIP_SMC_FCS_ECC_ALGO_MASK;
|
||||
i++;
|
||||
/* Data source address and size */
|
||||
payload[i] = src_addr;
|
||||
i++;
|
||||
payload[i] = data_size;
|
||||
i++;
|
||||
/* Signature + Public Key Data */
|
||||
sig_pubkey_offset = src_addr + data_size;
|
||||
memcpy((uint8_t *) &payload[i], (uint8_t *) sig_pubkey_offset,
|
||||
src_size - data_size);
|
||||
|
||||
i += (src_size - data_size) / MBOX_WORD_BYTE;
|
||||
|
||||
status = mailbox_send_cmd(MBOX_JOB_ID,
|
||||
MBOX_FCS_ECDSA_SHA2_DATA_SIGN_VERIFY, payload, i,
|
||||
CMD_CASUAL, (uint32_t *) dst_addr, &resp_len);
|
||||
|
||||
memset((void *) &fcs_sha2_data_sig_verify_param, 0,
|
||||
sizeof(fcs_crypto_service_data));
|
||||
|
||||
if (status < 0) {
|
||||
*mbox_error = -status;
|
||||
return INTEL_SIP_SMC_STATUS_ERROR;
|
||||
}
|
||||
|
||||
*dst_size = resp_len * MBOX_WORD_BYTE;
|
||||
flush_dcache_range(dst_addr, *dst_size);
|
||||
|
||||
return INTEL_SIP_SMC_STATUS_OK;
|
||||
}
|
||||
|
||||
int intel_fcs_ecdsa_get_pubkey_init(uint32_t session_id, uint32_t context_id,
|
||||
uint32_t key_id, uint32_t param_size,
|
||||
uint64_t param_data, uint32_t *mbox_error)
|
||||
|
|
|
@ -924,6 +924,19 @@ uintptr_t sip_smc_handler(uint32_t smc_fid,
|
|||
x4, x5, (uint32_t *) &x6, &mbox_error);
|
||||
SMC_RET4(handle, status, mbox_error, x5, x6);
|
||||
|
||||
case INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIG_VERIFY_INIT:
|
||||
x5 = SMC_GET_GP(handle, CTX_GPREG_X5);
|
||||
status = intel_fcs_ecdsa_sha2_data_sig_verify_init(x1, x2, x3,
|
||||
x4, x5, &mbox_error);
|
||||
SMC_RET2(handle, status, mbox_error);
|
||||
|
||||
case INTEL_SIP_SMC_FCS_ECDSA_SHA2_DATA_SIG_VERIFY_FINALIZE:
|
||||
x5 = SMC_GET_GP(handle, CTX_GPREG_X5);
|
||||
x6 = SMC_GET_GP(handle, CTX_GPREG_X6);
|
||||
x7 = SMC_GET_GP(handle, CTX_GPREG_X7);
|
||||
status = intel_fcs_ecdsa_sha2_data_sig_verify_finalize(x1, x2, x3,
|
||||
x4, x5, (uint32_t *) &x6, x7, &mbox_error);
|
||||
SMC_RET4(handle, status, mbox_error, x5, x6);
|
||||
|
||||
case INTEL_SIP_SMC_FCS_ECDSA_GET_PUBKEY_INIT:
|
||||
x5 = SMC_GET_GP(handle, CTX_GPREG_X5);
|
||||
|
|
Loading…
Reference in New Issue