michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: tfm_integration: Fix PSA crypto APIs

Browse source 
Moving to Mbed TLS 3.0 changes some of the Mbed TLS to better match the
PSA spec.  Fix up the things where we are affected by these API changes.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2021-08-30 12:33:27 -06:00 • committed by Kumar Gala
commit 26a630bf59
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
samples/tfm_integration/psa_crypto/src/psa_crypto.c
View file

@ -98,7 +98,7 @@ static psa_status_t crp_gen_key_secp256r1(psa_key_id_t key_id,
psa_status_t status = PSA_SUCCESS;
psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_key_type_t key_type =
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1);
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1);
psa_algorithm_t alg = PSA_ALG_ECDSA(PSA_ALG_SHA_256);
psa_key_handle_t key_handle;
size_t key_len = 32;
@ -242,7 +242,7 @@ static psa_status_t crp_hash_payload(uint8_t *msg, size_t msg_len,
}
/* Display the SHA-256 hash for debug purposes */
sf_hex_tabulate_16(&crp_fmt, hash, (size_t)(PSA_HASH_SIZE(alg)));
sf_hex_tabulate_16(&crp_fmt, hash, (size_t)(PSA_HASH_MAX_SIZE));
return status;
err:
@ -416,7 +416,7 @@ void crp_test(void)
{
psa_status_t status;
uint8_t msg[] = "Please hash and sign this message.";
uint8_t hash[PSA_HASH_SIZE(PSA_ALG_SHA_256)] = { 0 };
uint8_t hash[PSA_HASH_MAX_SIZE] = { 0 };
size_t hash_len;
uint8_t sig[PSA_VENDOR_ECDSA_SIGNATURE_MAX_SIZE] = { 0 };
size_t sig_len;

2
samples/tfm_integration/psa_crypto/src/util_app_log.c
View file

@ -84,7 +84,7 @@ psa_status_t al_psa_status(psa_status_t status, const char *func_name)
case PSA_ERROR_INSUFFICIENT_ENTROPY:
LOG_ERR("CRYPTO: Insufficient entropy");
break;
case PSA_ERROR_TAMPERING_DETECTED:
case PSA_ERROR_CORRUPTION_DETECTED:
LOG_ERR("CRYPTO: Tampering detected");
break;