ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-11 17:32:34 +08:00
Code Issues Releases Wiki Activity

Merge pull request #7814 from valeriosetti/issue7746

Browse Source 
PK: refactor wrappers in the USE_PSA case
This commit is contained in:
Manuel Pégourié-Gonnard 2023-07-03 09:32:31 +02:00 committed by GitHub
commit 45e009aa97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 461 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/pk.c
View File

@ -181,10 +181,13 @@ int mbedtls_pk_setup_opaque(mbedtls_pk_context *ctx,
type = psa_get_key_type(&attributes); type = psa_get_key_type(&attributes);
psa_reset_key_attributes(&attributes); psa_reset_key_attributes(&attributes);
#if defined(MBEDTLS_PK_HAVE_ECC_KEYS)
if (PSA_KEY_TYPE_IS_ECC_KEY_PAIR(type)) { if (PSA_KEY_TYPE_IS_ECC_KEY_PAIR(type)) {
info = &mbedtls_pk_ecdsa_opaque_info; info = &mbedtls_ecdsa_opaque_info;
} else if (type == PSA_KEY_TYPE_RSA_KEY_PAIR) { } else
info = &mbedtls_pk_rsa_opaque_info; #endif /* MBEDTLS_PK_HAVE_ECC_KEYS */
if (type == PSA_KEY_TYPE_RSA_KEY_PAIR) {
info = &mbedtls_rsa_opaque_info;
} else { } else {
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE; return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
} }

847
library/pk_wrap.c
View File

File diff suppressed because it is too large Load Diff

4
library/pk_wrap.h
View File

@ -134,8 +134,8 @@ extern const mbedtls_pk_info_t mbedtls_rsa_alt_info;
#endif #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
extern const mbedtls_pk_info_t mbedtls_pk_ecdsa_opaque_info; extern const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info;
extern const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info; extern const mbedtls_pk_info_t mbedtls_rsa_opaque_info;
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
#if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) #if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY)

16
tests/suites/test_suite_pk.function
View File

@ -223,8 +223,6 @@ void pk_psa_utils(int key_is_rsa)
mbedtls_pk_init(&pk2); mbedtls_pk_init(&pk2);
USE_PSA_INIT(); USE_PSA_INIT();
TEST_ASSERT(psa_crypto_init() == PSA_SUCCESS);
TEST_ASSERT(mbedtls_pk_setup_opaque(&pk, MBEDTLS_SVC_KEY_ID_INIT) == TEST_ASSERT(mbedtls_pk_setup_opaque(&pk, MBEDTLS_SVC_KEY_ID_INIT) ==
MBEDTLS_ERR_PK_BAD_INPUT_DATA); MBEDTLS_ERR_PK_BAD_INPUT_DATA);
@ -261,10 +259,11 @@ void pk_psa_utils(int key_is_rsa)
} }
/* unsupported operations: verify, decrypt, encrypt */ /* unsupported operations: verify, decrypt, encrypt */
TEST_ASSERT(mbedtls_pk_verify(&pk, md_alg, if (key_is_rsa == 1) {
b1, sizeof(b1), b2, sizeof(b2)) TEST_ASSERT(mbedtls_pk_verify(&pk, md_alg,
== MBEDTLS_ERR_PK_TYPE_MISMATCH); b1, sizeof(b1), b2, sizeof(b2))
if (key_is_rsa == 0) { == MBEDTLS_ERR_PK_TYPE_MISMATCH);
} else {
TEST_ASSERT(mbedtls_pk_decrypt(&pk, b1, sizeof(b1), TEST_ASSERT(mbedtls_pk_decrypt(&pk, b1, sizeof(b1),
b2, &len, sizeof(b2), b2, &len, sizeof(b2),
NULL, NULL) NULL, NULL)
@ -1367,6 +1366,11 @@ void pk_psa_sign(int parameter_arg,
TEST_ASSERT(mbedtls_pk_sign(&pk, MBEDTLS_MD_SHA256, TEST_ASSERT(mbedtls_pk_sign(&pk, MBEDTLS_MD_SHA256,
hash, sizeof(hash), sig, sizeof(sig), &sig_len, hash, sizeof(hash), sig, sizeof(sig), &sig_len,
NULL, NULL) == 0); NULL, NULL) == 0);
/* Only opaque EC keys support verification. */
if (PSA_KEY_TYPE_IS_ECC_KEY_PAIR(psa_type_arg)) {
TEST_ASSERT(mbedtls_pk_verify(&pk, MBEDTLS_MD_SHA256,
hash, sizeof(hash), sig, sig_len) == 0);
}
/* Export underlying public key for re-importing in a psa context. */ /* Export underlying public key for re-importing in a psa context. */
#if defined(MBEDTLS_PK_WRITE_C) #if defined(MBEDTLS_PK_WRITE_C)