Skip to content

Fix useless calls in PSA crypto metadata tests #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2020
Merged

Fix useless calls in PSA crypto metadata tests #378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b8f68
Fix documentation in PSA crypto metadata tests
ronald-cron-arm Mar 2, 2020
3876f4a
Fix useless calls in PSA crypto metadata tests
ronald-cron-arm Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions tests/suites/test_suite_psa_crypto_metadata.function
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,20 @@
#define TEST_CLASSIFICATION_MACRO( flag, alg, flags ) \
TEST_ASSERT( PSA_##flag( alg ) == !! ( ( flags ) & flag ) )

/* Check the parity of value.
* Return 0 if value has even parity and a nonzero value otherwise. */
/* Test the parity of value.
* Numerical encodings of key types and related values such as EC curves and
* DH groups should all have the same parity. This guarantees that a
* single-bit error will be detected.
* The expected parity is even because this makes all-bits-zero valid.
* The function returns a nonzero value if the parity is even, zero otherwise.
*/
int test_parity( uint32_t value )
{
value ^= value >> 16;
value ^= value >> 8;
value ^= value >> 4;
return( 0x9669 & 1 << ( value & 0xf ) );
}
#define TEST_PARITY( value ) \
TEST_ASSERT( test_parity( value ) )

void algorithm_classification( psa_algorithm_t alg, unsigned flags )
{
Expand Down Expand Up @@ -125,7 +128,7 @@ void key_type_classification( psa_key_type_t type, unsigned flags )
( PSA_KEY_TYPE_IS_DH( type ) &&
PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) ) );

TEST_PARITY( type );
TEST_ASSERT( test_parity( type ) );

exit: ;
}
Expand Down Expand Up @@ -497,7 +500,7 @@ void ecc_key_family( int curve_arg )
psa_key_type_t public_type = PSA_KEY_TYPE_ECC_PUBLIC_KEY( curve );
psa_key_type_t pair_type = PSA_KEY_TYPE_ECC_KEY_PAIR( curve );

test_parity( curve );
TEST_ASSERT( test_parity( curve ) );

test_key_type( public_type, KEY_TYPE_IS_ECC | KEY_TYPE_IS_PUBLIC_KEY );
test_key_type( pair_type, KEY_TYPE_IS_ECC | KEY_TYPE_IS_KEY_PAIR );
Expand All @@ -514,7 +517,7 @@ void dh_key_family( int group_arg )
psa_key_type_t public_type = PSA_KEY_TYPE_DH_PUBLIC_KEY( group );
psa_key_type_t pair_type = PSA_KEY_TYPE_DH_KEY_PAIR( group );

test_parity( group );
TEST_ASSERT( test_parity( group ) );

test_key_type( public_type, KEY_TYPE_IS_DH | KEY_TYPE_IS_PUBLIC_KEY );
test_key_type( pair_type, KEY_TYPE_IS_DH | KEY_TYPE_IS_KEY_PAIR );
Expand Down