Add test hash_bad_order
1. New test for testing bad order of hash function calls.
2. Removed test hash_update_bad_paths since it's test scenario
was moved to the new test.
3. Moved some scenarios from test hash_verify_bad_paths to
the new test.
diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 507ca9b..45ce896 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -356,14 +356,13 @@
depends_on:MBEDTLS_MD_C:MBEDTLS_SHA256_C
hash_setup:PSA_ALG_HMAC(PSA_ALG_SHA_256):PSA_ERROR_INVALID_ARGUMENT
+PSA hash: bad order function calls
+hash_bad_order:
+
PSA hash verify: bad paths
depends_on:MBEDTLS_SHA256_C
hash_verify_bad_paths:
-PSA hash update: bad paths
-depends_on:MBEDTLS_SHA256_C
-hash_update_bad_paths:
-
PSA hash finish: bad paths
depends_on:MBEDTLS_SHA256_C
hash_finish_bad_paths:
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 3db6df5..a6ab78e 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -1568,6 +1568,43 @@
/* END_CASE */
/* BEGIN_CASE */
+void hash_bad_order( )
+{
+ unsigned char input[] = "";
+ /* SHA-256 hash of an empty string */
+ unsigned char hash[] = {
+ 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8,
+ 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c,
+ 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 };
+ size_t hash_len;
+ psa_hash_operation_t operation;
+
+ TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
+
+ /* psa_hash_update without calling psa_hash_setup beforehand */
+ memset( &operation, 0, sizeof( operation ) );
+ TEST_ASSERT( psa_hash_update( &operation,
+ input, sizeof( input ) ) ==
+ PSA_ERROR_INVALID_ARGUMENT );
+
+ /* psa_hash_verify without calling psa_hash_setup beforehand */
+ memset( &operation, 0, sizeof( operation ) );
+ TEST_ASSERT( psa_hash_verify( &operation,
+ hash, sizeof( hash ) ) ==
+ PSA_ERROR_INVALID_ARGUMENT );
+
+ /* psa_hash_finish without calling psa_hash_setup beforehand */
+ memset( &operation, 0, sizeof( operation ) );
+ TEST_ASSERT( psa_hash_finish( &operation,
+ hash, sizeof( hash ), &hash_len ) ==
+ PSA_ERROR_INVALID_ARGUMENT );
+
+exit:
+ mbedtls_psa_crypto_free( );
+}
+/* END_CASE */
+
+/* BEGIN_CASE */
void hash_verify_bad_paths( )
{
psa_algorithm_t alg = PSA_ALG_SHA_256;
@@ -1587,12 +1624,6 @@
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
- /* psa_hash_verify without calling psa_hash_setup beforehand */
- memset( &operation, 0, sizeof( operation ) );
- TEST_ASSERT( psa_hash_verify( &operation,
- hash, expected_size ) ==
- PSA_ERROR_INVALID_ARGUMENT );
-
/* psa_hash_verify with a smaller hash digest than expected */
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_verify( &operation,
@@ -1625,25 +1656,6 @@
/* END_CASE */
/* BEGIN_CASE */
-void hash_update_bad_paths( )
-{
- unsigned char input[] = "input";
- psa_hash_operation_t operation;
-
- TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
-
- /* psa_hash_update without calling psa_hash_setup beforehand */
- memset( &operation, 0, sizeof( operation ) );
- TEST_ASSERT( psa_hash_update( &operation,
- input, sizeof( input ) ) ==
- PSA_ERROR_INVALID_ARGUMENT );
-
-exit:
- mbedtls_psa_crypto_free( );
-}
-/* END_CASE */
-
-/* BEGIN_CASE */
void hash_finish_bad_paths( )
{
psa_algorithm_t alg = PSA_ALG_SHA_256;
@@ -1654,12 +1666,6 @@
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
- /* psa_hash_finish without calling psa_hash_setup beforehand */
- memset( &operation, 0, sizeof( operation ) );
- TEST_ASSERT( psa_hash_finish( &operation,
- hash, expected_size,
- &hash_len ) == PSA_ERROR_INVALID_ARGUMENT );
-
/* psa_hash_finish with a smaller hash buffer than expected */
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_finish( &operation,