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

Fix crypto compliance tests 

Prevent passing null buffer with size which is non-zero.
pull/10023/head
itayzafrir 2019-03-10 15:46:40 +02:00
parent 774294d1e2
commit ea36a89ec7
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/TARGET_PSA/TESTS/compliance_crypto/test_c024/test_c024.c
View File

@ -90,12 +90,18 @@ int32_t psa_aead_encrypt_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5));
if (is_buffer_empty(check1[i].nonce, check1[i].nonce_length) == TRUE) if (is_buffer_empty(check1[i].nonce, check1[i].nonce_length) == TRUE)
{
nonce = NULL; nonce = NULL;
check1[i].nonce_length = 0;
}
else else
nonce = check1[i].nonce; nonce = check1[i].nonce;
if (is_buffer_empty(check1[i].additional_data, check1[i].additional_data_length) == TRUE) if (is_buffer_empty(check1[i].additional_data, check1[i].additional_data_length) == TRUE)
{
additional_data = NULL; additional_data = NULL;
check1[i].additional_data_length = 0;
}
else else
additional_data = check1[i].additional_data; additional_data = check1[i].additional_data;
@ -152,12 +158,18 @@ int32_t psa_aead_encrypt_negative_test(security_t caller)
check2[i].key_alg); check2[i].key_alg);
if (is_buffer_empty(check2[i].nonce, check2[i].nonce_length) == TRUE) if (is_buffer_empty(check2[i].nonce, check2[i].nonce_length) == TRUE)
{
nonce = NULL; nonce = NULL;
check2[i].nonce_length = 0;
}
else else
nonce = check2[i].nonce; nonce = check2[i].nonce;
if (is_buffer_empty(check2[i].additional_data, check2[i].additional_data_length) == TRUE) if (is_buffer_empty(check2[i].additional_data, check2[i].additional_data_length) == TRUE)
{
additional_data = NULL; additional_data = NULL;
check2[i].additional_data_length = 0;
}
else else
additional_data = check2[i].additional_data; additional_data = check2[i].additional_data;

12
components/TARGET_PSA/TESTS/compliance_crypto/test_c025/test_c025.c
View File

@ -89,12 +89,18 @@ int32_t psa_aead_decrypt_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5));
if (is_buffer_empty(check1[i].nonce, check1[i].nonce_length) == TRUE) if (is_buffer_empty(check1[i].nonce, check1[i].nonce_length) == TRUE)
{
nonce = NULL; nonce = NULL;
check1[i].nonce_length = 0;
}
else else
nonce = check1[i].nonce; nonce = check1[i].nonce;
if (is_buffer_empty(check1[i].additional_data, check1[i].additional_data_length) == TRUE) if (is_buffer_empty(check1[i].additional_data, check1[i].additional_data_length) == TRUE)
{
additional_data = NULL; additional_data = NULL;
check1[i].additional_data_length = 0;
}
else else
additional_data = check1[i].additional_data; additional_data = check1[i].additional_data;
@ -149,12 +155,18 @@ int32_t psa_aead_decrypt_negative_test(security_t caller)
check2[i].key_alg); check2[i].key_alg);
if (is_buffer_empty(check2[i].nonce, check2[i].nonce_length) == TRUE) if (is_buffer_empty(check2[i].nonce, check2[i].nonce_length) == TRUE)
{
nonce = NULL; nonce = NULL;
check2[i].nonce_length = 0;
}
else else
nonce = check2[i].nonce; nonce = check2[i].nonce;
if (is_buffer_empty(check2[i].additional_data, check2[i].additional_data_length) == TRUE) if (is_buffer_empty(check2[i].additional_data, check2[i].additional_data_length) == TRUE)
{
additional_data = NULL; additional_data = NULL;
check2[i].additional_data_length = 0;
}
else else
additional_data = check2[i].additional_data; additional_data = check2[i].additional_data;

6
components/TARGET_PSA/TESTS/compliance_crypto/test_c039/test_c039.c
View File

@ -128,7 +128,10 @@ int32_t psa_asymmetric_encrypt_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5));
if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE) if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE)
{
salt = NULL; salt = NULL;
check1[i].salt_length = 0;
}
else else
salt = check1[i].salt; salt = check1[i].salt;
@ -223,7 +226,10 @@ int32_t psa_asymmetric_encrypt_negative_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(6)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(6));
if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE) if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE)
{
salt = NULL; salt = NULL;
check1[i].salt_length = 0;
}
else else
salt = check1[i].salt; salt = check1[i].salt;

6
components/TARGET_PSA/TESTS/compliance_crypto/test_c040/test_c040.c
View File

@ -128,7 +128,10 @@ int32_t psa_asymmetric_decrypt_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(5));
if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE) if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE)
{
salt = NULL; salt = NULL;
check1[i].salt_length = 0;
}
else else
salt = check1[i].salt; salt = check1[i].salt;
@ -209,7 +212,10 @@ int32_t psa_asymmetric_decrypt_negative_test(security_t caller)
TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(6)); TEST_ASSERT_EQUAL(status, PSA_SUCCESS, TEST_CHECKPOINT_NUM(6));
if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE) if (is_buffer_empty(check1[i].salt, check1[i].salt_length) == TRUE)
{
salt = NULL; salt = NULL;
check1[i].salt_length = 0;
}
else else
salt = check1[i].salt; salt = check1[i].salt;