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

Implement safe buffer copying in asymmetric signature API

Browse Source 
Use local copy buffer macros to implement safe
copy mechanism in asymmetric signature API.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney
2024-01-18 17:23:02 +00:00
parent f35d24479e
commit 4f8847bb5d
1 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
library/psa_crypto.c
View File

@ -3165,15 +3165,25 @@ psa_status_t psa_sign_message_builtin(
psa_status_t psa_sign_message(mbedtls_svc_key_id_t key, psa_status_t psa_sign_message(mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t *input, const uint8_t *input_external,
size_t input_length, size_t input_length,
uint8_t *signature, uint8_t *signature_external,
size_t signature_size, size_t signature_size,
size_t *signature_length) size_t *signature_length)
{ {
return psa_sign_internal( psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
key, 1, alg, input, input_length, LOCAL_INPUT_DECLARE(input_external, input);
signature, signature_size, signature_length); LOCAL_OUTPUT_DECLARE(signature_external, signature);
LOCAL_INPUT_ALLOC(input_external, input_length, input);
LOCAL_OUTPUT_ALLOC(signature_external, signature_size, signature);
status = psa_sign_internal(key, 1, alg, input, input_length, signature,
signature_size, signature_length);
exit:
LOCAL_INPUT_FREE(input_external, input);
LOCAL_OUTPUT_FREE(signature_external, signature);
return status;
} }
psa_status_t psa_verify_message_builtin( psa_status_t psa_verify_message_builtin(
@ -3212,14 +3222,25 @@ psa_status_t psa_verify_message_builtin(
psa_status_t psa_verify_message(mbedtls_svc_key_id_t key, psa_status_t psa_verify_message(mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t *input, const uint8_t *input_external,
size_t input_length, size_t input_length,
const uint8_t *signature, const uint8_t *signature_external,
size_t signature_length) size_t signature_length)
{ {
return psa_verify_internal( psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
key, 1, alg, input, input_length, LOCAL_INPUT_DECLARE(input_external, input);
signature, signature_length); LOCAL_INPUT_DECLARE(signature_external, signature);
LOCAL_INPUT_ALLOC(input_external, input_length, input);
LOCAL_INPUT_ALLOC(signature_external, signature_length, signature);
status = psa_verify_internal(key, 1, alg, input, input_length, signature,
signature_length);
exit:
LOCAL_INPUT_FREE(input_external, input);
LOCAL_INPUT_FREE(signature_external, signature);
return status;
} }
psa_status_t psa_sign_hash_builtin( psa_status_t psa_sign_hash_builtin(
@ -3272,15 +3293,26 @@ psa_status_t psa_sign_hash_builtin(
psa_status_t psa_sign_hash(mbedtls_svc_key_id_t key, psa_status_t psa_sign_hash(mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t *hash, const uint8_t *hash_external,
size_t hash_length, size_t hash_length,
uint8_t *signature, uint8_t *signature_external,
size_t signature_size, size_t signature_size,
size_t *signature_length) size_t *signature_length)
{ {
return psa_sign_internal( psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
key, 0, alg, hash, hash_length, LOCAL_INPUT_DECLARE(hash_external, hash);
signature, signature_size, signature_length); LOCAL_OUTPUT_DECLARE(signature_external, signature);
LOCAL_INPUT_ALLOC(hash_external, hash_length, hash);
LOCAL_OUTPUT_ALLOC(signature_external, signature_size, signature);
status = psa_sign_internal(key, 0, alg, hash, hash_length, signature,
signature_size, signature_length);
exit:
LOCAL_INPUT_FREE(hash_external, hash);
LOCAL_OUTPUT_FREE(signature_external, signature);
return status;
} }
psa_status_t psa_verify_hash_builtin( psa_status_t psa_verify_hash_builtin(
@ -3332,14 +3364,25 @@ psa_status_t psa_verify_hash_builtin(
psa_status_t psa_verify_hash(mbedtls_svc_key_id_t key, psa_status_t psa_verify_hash(mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t *hash, const uint8_t *hash_external,
size_t hash_length, size_t hash_length,
const uint8_t *signature, const uint8_t *signature_external,
size_t signature_length) size_t signature_length)
{ {
return psa_verify_internal( psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
key, 0, alg, hash, hash_length, LOCAL_INPUT_DECLARE(hash_external, hash);
signature, signature_length); LOCAL_INPUT_DECLARE(signature_external, signature);
LOCAL_INPUT_ALLOC(hash_external, hash_length, hash);
LOCAL_INPUT_ALLOC(signature_external, signature_length, signature);
status = psa_verify_internal(key, 0, alg, hash, hash_length, signature,
signature_length);
exit:
LOCAL_INPUT_FREE(hash_external, hash);
LOCAL_INPUT_FREE(signature_external, signature);
return status;
} }
psa_status_t psa_asymmetric_encrypt(mbedtls_svc_key_id_t key, psa_status_t psa_asymmetric_encrypt(mbedtls_svc_key_id_t key,