mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-30 22:43:08 +03:00
Merge pull request #1181 from tom-daubney-arm/key_agreement_buffer_protection
Implement safe buffer copying in key agreement
This commit is contained in:
@ -7581,12 +7581,13 @@ exit:
|
|||||||
psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *operation,
|
psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *operation,
|
||||||
psa_key_derivation_step_t step,
|
psa_key_derivation_step_t step,
|
||||||
mbedtls_svc_key_id_t private_key,
|
mbedtls_svc_key_id_t private_key,
|
||||||
const uint8_t *peer_key,
|
const uint8_t *peer_key_external,
|
||||||
size_t peer_key_length)
|
size_t peer_key_length)
|
||||||
{
|
{
|
||||||
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
|
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
|
||||||
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
|
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
|
||||||
psa_key_slot_t *slot;
|
psa_key_slot_t *slot;
|
||||||
|
LOCAL_INPUT_DECLARE(peer_key_external, peer_key);
|
||||||
|
|
||||||
if (!PSA_ALG_IS_KEY_AGREEMENT(operation->alg)) {
|
if (!PSA_ALG_IS_KEY_AGREEMENT(operation->alg)) {
|
||||||
return PSA_ERROR_INVALID_ARGUMENT;
|
return PSA_ERROR_INVALID_ARGUMENT;
|
||||||
@ -7596,9 +7597,15 @@ psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *op
|
|||||||
if (status != PSA_SUCCESS) {
|
if (status != PSA_SUCCESS) {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOCAL_INPUT_ALLOC(peer_key_external, peer_key_length, peer_key)
|
||||||
status = psa_key_agreement_internal(operation, step,
|
status = psa_key_agreement_internal(operation, step,
|
||||||
slot,
|
slot,
|
||||||
peer_key, peer_key_length);
|
peer_key, peer_key_length);
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
|
||||||
|
exit:
|
||||||
|
#endif
|
||||||
if (status != PSA_SUCCESS) {
|
if (status != PSA_SUCCESS) {
|
||||||
psa_key_derivation_abort(operation);
|
psa_key_derivation_abort(operation);
|
||||||
} else {
|
} else {
|
||||||
@ -7610,15 +7617,15 @@ psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *op
|
|||||||
}
|
}
|
||||||
|
|
||||||
unlock_status = psa_unregister_read(slot);
|
unlock_status = psa_unregister_read(slot);
|
||||||
|
LOCAL_INPUT_FREE(peer_key_external, peer_key);
|
||||||
return (status == PSA_SUCCESS) ? unlock_status : status;
|
return (status == PSA_SUCCESS) ? unlock_status : status;
|
||||||
}
|
}
|
||||||
|
|
||||||
psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
|
psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
|
||||||
mbedtls_svc_key_id_t private_key,
|
mbedtls_svc_key_id_t private_key,
|
||||||
const uint8_t *peer_key,
|
const uint8_t *peer_key_external,
|
||||||
size_t peer_key_length,
|
size_t peer_key_length,
|
||||||
uint8_t *output,
|
uint8_t *output_external,
|
||||||
size_t output_size,
|
size_t output_size,
|
||||||
size_t *output_length)
|
size_t *output_length)
|
||||||
{
|
{
|
||||||
@ -7626,6 +7633,9 @@ psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
|
|||||||
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
|
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
|
||||||
psa_key_slot_t *slot = NULL;
|
psa_key_slot_t *slot = NULL;
|
||||||
size_t expected_length;
|
size_t expected_length;
|
||||||
|
LOCAL_INPUT_DECLARE(peer_key_external, peer_key);
|
||||||
|
LOCAL_OUTPUT_DECLARE(output_external, output);
|
||||||
|
LOCAL_OUTPUT_ALLOC(output_external, output_size, output);
|
||||||
|
|
||||||
if (!PSA_ALG_IS_KEY_AGREEMENT(alg)) {
|
if (!PSA_ALG_IS_KEY_AGREEMENT(alg)) {
|
||||||
status = PSA_ERROR_INVALID_ARGUMENT;
|
status = PSA_ERROR_INVALID_ARGUMENT;
|
||||||
@ -7652,13 +7662,16 @@ psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
|
|||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOCAL_INPUT_ALLOC(peer_key_external, peer_key_length, peer_key);
|
||||||
status = psa_key_agreement_raw_internal(alg, slot,
|
status = psa_key_agreement_raw_internal(alg, slot,
|
||||||
peer_key, peer_key_length,
|
peer_key, peer_key_length,
|
||||||
output, output_size,
|
output, output_size,
|
||||||
output_length);
|
output_length);
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
if (status != PSA_SUCCESS) {
|
/* Check for successful allocation of output,
|
||||||
|
* with an unsuccessful status. */
|
||||||
|
if (output != NULL && status != PSA_SUCCESS) {
|
||||||
/* If an error happens and is not handled properly, the output
|
/* If an error happens and is not handled properly, the output
|
||||||
* may be used as a key to protect sensitive data. Arrange for such
|
* may be used as a key to protect sensitive data. Arrange for such
|
||||||
* a key to be random, which is likely to result in decryption or
|
* a key to be random, which is likely to result in decryption or
|
||||||
@ -7670,8 +7683,15 @@ exit:
|
|||||||
*output_length = output_size;
|
*output_length = output_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (output == NULL) {
|
||||||
|
/* output allocation failed. */
|
||||||
|
*output_length = 0;
|
||||||
|
}
|
||||||
|
|
||||||
unlock_status = psa_unregister_read(slot);
|
unlock_status = psa_unregister_read(slot);
|
||||||
|
|
||||||
|
LOCAL_INPUT_FREE(peer_key_external, peer_key);
|
||||||
|
LOCAL_OUTPUT_FREE(output_external, output);
|
||||||
return (status == PSA_SUCCESS) ? unlock_status : status;
|
return (status == PSA_SUCCESS) ? unlock_status : status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,6 +169,9 @@ class PSAWrapperGenerator(c_wrapper_generator.Base):
|
|||||||
'psa_hash_compute',
|
'psa_hash_compute',
|
||||||
'psa_hash_compare'):
|
'psa_hash_compare'):
|
||||||
return True
|
return True
|
||||||
|
if function_name in ('psa_key_derivation_key_agreement',
|
||||||
|
'psa_raw_key_agreement'):
|
||||||
|
return True
|
||||||
if function_name == 'psa_generate_random':
|
if function_name == 'psa_generate_random':
|
||||||
return True
|
return True
|
||||||
if function_name in ('psa_mac_update',
|
if function_name in ('psa_mac_update',
|
||||||
|
@ -810,7 +810,13 @@ psa_status_t mbedtls_test_wrap_psa_key_derivation_key_agreement(
|
|||||||
const uint8_t *arg3_peer_key,
|
const uint8_t *arg3_peer_key,
|
||||||
size_t arg4_peer_key_length)
|
size_t arg4_peer_key_length)
|
||||||
{
|
{
|
||||||
|
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
|
||||||
|
MBEDTLS_TEST_MEMORY_POISON(arg3_peer_key, arg4_peer_key_length);
|
||||||
|
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
|
||||||
psa_status_t status = (psa_key_derivation_key_agreement)(arg0_operation, arg1_step, arg2_private_key, arg3_peer_key, arg4_peer_key_length);
|
psa_status_t status = (psa_key_derivation_key_agreement)(arg0_operation, arg1_step, arg2_private_key, arg3_peer_key, arg4_peer_key_length);
|
||||||
|
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
|
||||||
|
MBEDTLS_TEST_MEMORY_UNPOISON(arg3_peer_key, arg4_peer_key_length);
|
||||||
|
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1107,7 +1113,15 @@ psa_status_t mbedtls_test_wrap_psa_raw_key_agreement(
|
|||||||
size_t arg5_output_size,
|
size_t arg5_output_size,
|
||||||
size_t *arg6_output_length)
|
size_t *arg6_output_length)
|
||||||
{
|
{
|
||||||
|
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
|
||||||
|
MBEDTLS_TEST_MEMORY_POISON(arg2_peer_key, arg3_peer_key_length);
|
||||||
|
MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size);
|
||||||
|
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
|
||||||
psa_status_t status = (psa_raw_key_agreement)(arg0_alg, arg1_private_key, arg2_peer_key, arg3_peer_key_length, arg4_output, arg5_output_size, arg6_output_length);
|
psa_status_t status = (psa_raw_key_agreement)(arg0_alg, arg1_private_key, arg2_peer_key, arg3_peer_key_length, arg4_output, arg5_output_size, arg6_output_length);
|
||||||
|
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
|
||||||
|
MBEDTLS_TEST_MEMORY_UNPOISON(arg2_peer_key, arg3_peer_key_length);
|
||||||
|
MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size);
|
||||||
|
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -359,9 +359,9 @@ void key_agreement_fail(int key_type_arg, data_t *key_data,
|
|||||||
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
||||||
mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT;
|
mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT;
|
||||||
uint8_t public_key[PSA_EXPORT_PUBLIC_KEY_MAX_SIZE] = { 0 };
|
uint8_t public_key[PSA_EXPORT_PUBLIC_KEY_MAX_SIZE] = { 0 };
|
||||||
size_t public_key_length = SIZE_MAX;
|
size_t public_key_length = 0;
|
||||||
uint8_t output[PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE] = { 0 };
|
uint8_t output[PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE] = { 0 };
|
||||||
size_t length = SIZE_MAX;
|
size_t length = 0;
|
||||||
psa_key_derivation_operation_t operation = PSA_KEY_DERIVATION_OPERATION_INIT;
|
psa_key_derivation_operation_t operation = PSA_KEY_DERIVATION_OPERATION_INIT;
|
||||||
|
|
||||||
PSA_INIT();
|
PSA_INIT();
|
||||||
|
Reference in New Issue
Block a user