ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9990 from kfnta/sync_complinace_test_to_latest 

Sync PSA compliance test to latest version
pull/10012/head
Cruz Monrreal 2019-03-07 23:36:56 -06:00 committed by GitHub
parent 277c91f3b7 c99f03d0ce
commit 57ec1d57b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/TARGET_PSA/TESTS/compliance_crypto/test_c043/test_c043.c
View File

@ -86,32 +86,35 @@ int32_t psa_key_agreement_test(security_t caller)
/* Abort a generator */ /* Abort a generator */
status = val->crypto_function(VAL_CRYPTO_GENERATOR_ABORT, &generator); status = val->crypto_function(VAL_CRYPTO_GENERATOR_ABORT, &generator);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(7)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(7));
/* Destroy a key and restore the slot to its default state */
status = val->crypto_function(VAL_CRYPTO_DESTROY_KEY, check1[i].key_handle);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(8));
continue; continue;
} }
/* Retrieve the current capacity of a generator */ /* Retrieve the current capacity of a generator */
status = val->crypto_function(VAL_CRYPTO_GET_GENERATOR_CAPACITY, &generator, &capacity); status = val->crypto_function(VAL_CRYPTO_GET_GENERATOR_CAPACITY, &generator, &capacity);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(8)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(9));
/* Check if the generator capacity matches with the expected capacity */ /* Check if the generator capacity matches with the expected capacity */
TEST_ASSERT_EQUAL(capacity, check1[i].expected_capacity, TEST_CHECKPOINT_NUM(9)); TEST_ASSERT_EQUAL(capacity, check1[i].expected_capacity, TEST_CHECKPOINT_NUM(10));
/* Read some data from a generator */ /* Read some data from a generator */
status = val->crypto_function(VAL_CRYPTO_GENERATOR_READ, &generator, output, status = val->crypto_function(VAL_CRYPTO_GENERATOR_READ, &generator, output,
check1[i].expected_output_length); check1[i].expected_output_length);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(10)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(11));
/* Check if the output matches with the expected data */ /* Check if the output matches with the expected data */
TEST_ASSERT_MEMCMP(output, check1[i].expected_output, check1[i].expected_output_length, TEST_ASSERT_MEMCMP(output, check1[i].expected_output, check1[i].expected_output_length,
TEST_CHECKPOINT_NUM(11)); TEST_CHECKPOINT_NUM(12));
/* Abort a generator */ /* Abort a generator */
status = val->crypto_function(VAL_CRYPTO_GENERATOR_ABORT, &generator); status = val->crypto_function(VAL_CRYPTO_GENERATOR_ABORT, &generator);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(12)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(13));
/* Destroy a key and restore the slot to its default state */ /* Destroy a key and restore the slot to its default state */
status = val->crypto_function(VAL_CRYPTO_DESTROY_KEY, check1[i].key_handle); status = val->crypto_function(VAL_CRYPTO_DESTROY_KEY, check1[i].key_handle);
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(13)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(14));
} }
return VAL_STATUS_SUCCESS; return VAL_STATUS_SUCCESS;

3
features/frameworks/TARGET_PSA/mbed_lib.json Normal file
View File

@ -0,0 +1,3 @@
{
"name": "psa-compliance-framework"
}

3
features/frameworks/TARGET_PSA/pal/pal_mbed_os_intf.cpp
View File

@ -26,6 +26,9 @@ extern "C" psa_status_t psa_ps_reset();
test_entry_f test_g = NULL; test_entry_f test_g = NULL;
compliance_test_type type_g = COMPLIANCE_TEST_UNDEFINED; compliance_test_type type_g = COMPLIANCE_TEST_UNDEFINED;
// randomly generated attestation key used for testing the attestation feature.
// The specific key chosen shouldn't matter to the attestation test
// the test just needs a key to be injected before it is run.
static const uint8_t private_key_data[] = { static const uint8_t private_key_data[] = {
0x49, 0xc9, 0xa8, 0xc1, 0x8c, 0x4b, 0x88, 0x56, 0x49, 0xc9, 0xa8, 0xc1, 0x8c, 0x4b, 0x88, 0x56,
0x38, 0xc4, 0x31, 0xcf, 0x1d, 0xf1, 0xc9, 0x94, 0x38, 0xc4, 0x31, 0xcf, 0x1d, 0xf1, 0xc9, 0x94,

0
features/frameworks/TARGET_PSA/psa_manifest/sid.h
View File