From 789542168deec8c5217703287fe72ae2a2e0f398 Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Mon, 19 Nov 2018 13:38:41 +0200 Subject: [PATCH] Fix issues in CC310 cc_internal discovered by OTT Return `MBEDTLS_ERR_ECP_INVALID_KEY` when Cryptocell returns `CRYS_ECPKI_BUILD_KEY_INVALID_PRIV_KEY_SIZE_ERROR` or `CRYS_ECPKI_BUILD_KEY_INVALID_PUBL_KEY_SIZE_ERROR`, When the key size is invalid. Found by the "ECDSA zero private parameter" tests. --- features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c b/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c index 5415975c0b..d3502e45dc 100644 --- a/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c +++ b/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c @@ -144,6 +144,8 @@ int convert_CrysError_to_mbedtls_err( CRYSError_t Crys_err ) case CRYS_ECPKI_GEN_KEY_INVALID_PRIVATE_KEY_PTR_ERROR: case CRYS_ECPKI_EXPORT_PUBL_KEY_INVALID_PUBL_KEY_DATA_ERROR: case CRYS_ECPKI_BUILD_KEY_INVALID_PRIV_KEY_DATA_ERROR: + case CRYS_ECPKI_BUILD_KEY_INVALID_PRIV_KEY_SIZE_ERROR: + case CRYS_ECPKI_BUILD_KEY_INVALID_PUBL_KEY_SIZE_ERROR: return ( MBEDTLS_ERR_ECP_INVALID_KEY ); default: