lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

pk: pk_copy_from_psa() performs the conversion even if the algorithm doesn't match

Browse Source 
This commit also:
- fixes existing tests and add new ones
- updates documentation.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2024-02-23 17:55:28 +01:00
parent 1015985d8a
commit a657ae388a
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/pk.c
View File

@ -27,7 +27,7 @@
#include "mbedtls/ecdsa.h"
#endif
#if defined(MBEDTLS_PSA_CRYPTO_C)
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
#include "psa_util_internal.h"
#include "mbedtls/psa_util.h"
#endif
@ -1413,12 +1413,6 @@ int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk
#if defined(MBEDTLS_RSA_C)
if ((key_type == PSA_KEY_TYPE_RSA_KEY_PAIR) ||
(key_type == PSA_KEY_TYPE_RSA_PUBLIC_KEY)) {
if (!PSA_ALG_IS_RSA_PKCS1V15_SIGN(alg_type) &&
(alg_type != PSA_ALG_RSA_PKCS1V15_CRYPT) &&
!PSA_ALG_IS_RSA_OAEP(alg_type) &&
!PSA_ALG_IS_RSA_PSS(alg_type)) {
return MBEDTLS_ERR_PK_BAD_INPUT_DATA;
}
ret = mbedtls_pk_setup(pk, mbedtls_pk_info_from_type(MBEDTLS_PK_RSA));
if (ret != 0) {
@ -1435,7 +1429,7 @@ int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk
}
mbedtls_md_type_t md_type = MBEDTLS_MD_NONE;
if ((alg_type != PSA_ALG_RSA_PKCS1V15_CRYPT) &&
if ((PSA_ALG_GET_HASH(alg_type) != PSA_ALG_NONE) &&
(PSA_ALG_GET_HASH(alg_type) != PSA_ALG_ANY_HASH)) {
md_type = mbedtls_md_type_from_psa_alg(alg_type);
}
@ -1455,11 +1449,6 @@ int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk
PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY(key_type)) {
mbedtls_ecp_group_id grp_id;
if (!PSA_ALG_IS_ECDSA(alg_type)) {
ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
goto exit;
}
ret = mbedtls_pk_setup(pk, mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY));
if (ret != 0) {
goto exit;