From 74c932e596e23bf5a8034ce5b80c7b116deb139b Mon Sep 17 00:00:00 2001 From: Darryl Green Date: Fri, 16 Aug 2019 15:24:14 +0100 Subject: [PATCH] Parametrize key bits in import mock test --- .../test_suite_psa_crypto_se_driver_hal_mocks.data | 12 +++++++++--- ...est_suite_psa_crypto_se_driver_hal_mocks.function | 6 +++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data b/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data index c05b18274c..dba68758fe 100644 --- a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data +++ b/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data @@ -1,11 +1,17 @@ SE key importing mock test -mock_import:PSA_SUCCESS:PSA_SUCCESS:PSA_SUCCESS +mock_import:PSA_SUCCESS:PSA_SUCCESS:0:PSA_SUCCESS + +SE key importing mock test: max key bits +mock_import:PSA_SUCCESS:PSA_SUCCESS:PSA_MAX_KEY_BITS:PSA_SUCCESS + +SE key importing mock test: more than max key bits +mock_import:PSA_SUCCESS:PSA_ERROR_NOT_SUPPORTED:PSA_MAX_KEY_BITS+1:PSA_ERROR_NOT_SUPPORTED SE key importing mock test: alloc failed -mock_import:PSA_ERROR_HARDWARE_FAILURE:PSA_SUCCESS:PSA_ERROR_HARDWARE_FAILURE +mock_import:PSA_ERROR_HARDWARE_FAILURE:PSA_SUCCESS:0:PSA_ERROR_HARDWARE_FAILURE SE key importing mock test: import failed -mock_import:PSA_SUCCESS:PSA_ERROR_HARDWARE_FAILURE:PSA_ERROR_HARDWARE_FAILURE +mock_import:PSA_SUCCESS:PSA_ERROR_HARDWARE_FAILURE:0:PSA_ERROR_HARDWARE_FAILURE SE key exporting mock test mock_export:PSA_SUCCESS:PSA_SUCCESS diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function b/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function index 9d73d8f1ac..e3641789fa 100644 --- a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function +++ b/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function @@ -19,6 +19,7 @@ static struct uint16_t called; psa_key_slot_number_t key_slot; psa_key_attributes_t attributes; + size_t bits; size_t data_length; psa_status_t return_value; } mock_import_data; @@ -130,7 +131,8 @@ static psa_status_t mock_import( psa_drv_se_context_t *drv_context, { (void) drv_context; (void) data; - (void) bits; + + *bits = mock_import_data.bits; mock_import_data.called++; mock_import_data.key_slot = key_slot; @@ -259,6 +261,7 @@ psa_status_t mock_destroy( psa_drv_se_context_t *context, /* BEGIN_CASE */ void mock_import( int mock_alloc_return_value, int mock_import_return_value, + int bits, int expected_result ) { psa_drv_se_t driver; @@ -271,6 +274,7 @@ void mock_import( int mock_alloc_return_value, mock_allocate_data.return_value = mock_alloc_return_value; mock_import_data.return_value = mock_import_return_value; + mock_import_data.bits = bits; memset( &driver, 0, sizeof( driver ) ); memset( &key_management, 0, sizeof( key_management ) ); driver.hal_version = PSA_DRV_SE_HAL_VERSION;