mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 13:45:42 +01:00
Ensure that all flags are actually tested
At least twice, we added a classification flag but forgot to test it in the relevant test functions. Add some protection so that this doesn't happen again. In each classification category, put a macro xxx_FLAG_MASK_PLUS_ONE at the end. In the corresponding test function, keep track of the flags that are tested, and check that their mask is xxx_FLAG_MASK_PLUS_ONE - 1 which is all the bits of the previous flags set. Now, if we add a flag without testing it, the test TEST_EQUAL( classification_flags_tested, xxx_FLAG_MASK_PLUS_ONE - 1 ) will fail. It will also fail if we make the set of flag numbers non-consecutive, which is ok. This reveals that three algorithm flags had been added but not tested (in two separate occasions). Also, one key type flag that is no longer used by the library was still defined but not tested, which is not a test gap but is inconsistent. It's for DSA, which is relevant to the PSA encoding even if Mbed TLS doesn't implement it, so keep the flag and do test it. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
parent
e65be27eea
commit
31b95155ba
@ -44,6 +44,7 @@
|
||||
#define ALG_IS_AEAD_ON_BLOCK_CIPHER ( 1u << 25 )
|
||||
#define ALG_IS_TLS12_PRF ( 1u << 26 )
|
||||
#define ALG_IS_TLS12_PSK_TO_MS ( 1u << 27 )
|
||||
#define ALG_FLAG_MASK_PLUS_ONE ( 1u << 28 ) /* must be last! */
|
||||
|
||||
/* Flags for key type classification macros. There is a flag for every
|
||||
* key type classification macro PSA_KEY_TYPE_IS_xxx except for some that
|
||||
@ -57,21 +58,38 @@
|
||||
#define KEY_TYPE_IS_DSA ( 1u << 5 )
|
||||
#define KEY_TYPE_IS_ECC ( 1u << 6 )
|
||||
#define KEY_TYPE_IS_DH ( 1u << 7 )
|
||||
#define KEY_TYPE_FLAG_MASK_PLUS_ONE ( 1u << 8 ) /* must be last! */
|
||||
|
||||
/* Flags for lifetime classification macros. There is a flag for every
|
||||
* lifetime classification macro PSA_KEY_LIFETIME_IS_xxx. The name of the
|
||||
* flag is the name of the classification macro without the PSA_ prefix. */
|
||||
#define KEY_LIFETIME_IS_VOLATILE ( 1u << 0 )
|
||||
#define KEY_LIFETIME_IS_READ_ONLY ( 1u << 1 )
|
||||
#define KEY_LIFETIME_FLAG_MASK_PLUS_ONE ( 1u << 2 ) /* must be last! */
|
||||
|
||||
#define TEST_CLASSIFICATION_MACRO( flag, alg, flags ) \
|
||||
do \
|
||||
{ \
|
||||
if( ( flags ) & ( flag ) ) \
|
||||
TEST_ASSERT( PSA_##flag( alg ) ); \
|
||||
else \
|
||||
TEST_ASSERT( ! PSA_##flag( alg ) ); \
|
||||
} \
|
||||
/* Check that in the value of flags, the bit flag (which should be a macro
|
||||
* expanding to a number of the form 1 << k) is set if and only if
|
||||
* PSA_##flag(alg) is true.
|
||||
*
|
||||
* Only perform this check if cond is true. Typically cond is 1, but it can
|
||||
* be different if the value of the flag bit is only specified under specific
|
||||
* conditions.
|
||||
*
|
||||
* Unconditionally mask flag into the ambient variable
|
||||
* classification_flags_tested.
|
||||
*/
|
||||
#define TEST_CLASSIFICATION_MACRO( cond, flag, alg, flags ) \
|
||||
do \
|
||||
{ \
|
||||
if( cond ) \
|
||||
{ \
|
||||
if( ( flags ) & ( flag ) ) \
|
||||
TEST_ASSERT( PSA_##flag( alg ) ); \
|
||||
else \
|
||||
TEST_ASSERT( ! PSA_##flag( alg ) ); \
|
||||
} \
|
||||
classification_flags_tested |= ( flag ); \
|
||||
} \
|
||||
while( 0 )
|
||||
|
||||
/* Check the parity of value.
|
||||
@ -98,45 +116,50 @@ int has_even_parity( uint32_t value )
|
||||
|
||||
void algorithm_classification( psa_algorithm_t alg, unsigned flags )
|
||||
{
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_VENDOR_DEFINED, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_HMAC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_BLOCK_CIPHER_MAC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_STREAM_CIPHER, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RSA_PKCS1V15_SIGN, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RSA_PSS, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_DSA, alg, flags );
|
||||
if ( PSA_ALG_IS_DSA( alg ) )
|
||||
TEST_CLASSIFICATION_MACRO( ALG_DSA_IS_DETERMINISTIC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_DETERMINISTIC_DSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RANDOMIZED_DSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_ECDSA, alg, flags );
|
||||
if ( PSA_ALG_IS_ECDSA( alg ) )
|
||||
TEST_CLASSIFICATION_MACRO( ALG_ECDSA_IS_DETERMINISTIC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_DETERMINISTIC_ECDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RANDOMIZED_ECDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_HASH_EDDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_SIGN_HASH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_HASH_AND_SIGN, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RSA_OAEP, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_HKDF, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_WILDCARD, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_ECDH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_FFDH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_RAW_KEY_AGREEMENT, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( ALG_IS_AEAD_ON_BLOCK_CIPHER, alg, flags );
|
||||
unsigned classification_flags_tested = 0;
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_VENDOR_DEFINED, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_HMAC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_BLOCK_CIPHER_MAC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_STREAM_CIPHER, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RSA_PKCS1V15_SIGN, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RSA_PSS, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_DSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( PSA_ALG_IS_DSA( alg ),
|
||||
ALG_DSA_IS_DETERMINISTIC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_DETERMINISTIC_DSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RANDOMIZED_DSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_ECDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( PSA_ALG_IS_ECDSA( alg ),
|
||||
ALG_ECDSA_IS_DETERMINISTIC, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_DETERMINISTIC_ECDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RANDOMIZED_ECDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_HASH_EDDSA, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_SIGN_HASH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_HASH_AND_SIGN, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RSA_OAEP, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_HKDF, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_WILDCARD, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_ECDH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_FFDH, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_RAW_KEY_AGREEMENT, alg, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, ALG_IS_AEAD_ON_BLOCK_CIPHER, alg, flags );
|
||||
TEST_EQUAL( classification_flags_tested, ALG_FLAG_MASK_PLUS_ONE - 1 );
|
||||
exit: ;
|
||||
}
|
||||
|
||||
void key_type_classification( psa_key_type_t type, unsigned flags )
|
||||
{
|
||||
unsigned classification_flags_tested = 0;
|
||||
|
||||
/* Macros tested based on the test case parameter */
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_VENDOR_DEFINED, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_UNSTRUCTURED, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_PUBLIC_KEY, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_KEY_PAIR, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_RSA, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_ECC, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_TYPE_IS_DH, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_VENDOR_DEFINED, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_UNSTRUCTURED, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_PUBLIC_KEY, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_KEY_PAIR, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_RSA, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_ECC, type, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_TYPE_IS_DH, type, flags );
|
||||
TEST_EQUAL( classification_flags_tested, KEY_TYPE_FLAG_MASK_PLUS_ONE - 1 );
|
||||
|
||||
/* Macros with derived semantics */
|
||||
TEST_EQUAL( PSA_KEY_TYPE_IS_ASYMMETRIC( type ),
|
||||
@ -672,9 +695,12 @@ void lifetime( int lifetime_arg, int classification_flags,
|
||||
psa_key_persistence_t persistence = persistence_arg;
|
||||
psa_key_location_t location = location_arg;
|
||||
unsigned flags = classification_flags;
|
||||
unsigned classification_flags_tested = 0;
|
||||
|
||||
TEST_CLASSIFICATION_MACRO( KEY_LIFETIME_IS_VOLATILE, lifetime, flags );
|
||||
TEST_CLASSIFICATION_MACRO( KEY_LIFETIME_IS_READ_ONLY, lifetime, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_LIFETIME_IS_VOLATILE, lifetime, flags );
|
||||
TEST_CLASSIFICATION_MACRO( 1, KEY_LIFETIME_IS_READ_ONLY, lifetime, flags );
|
||||
TEST_EQUAL( classification_flags_tested,
|
||||
KEY_LIFETIME_FLAG_MASK_PLUS_ONE - 1 );
|
||||
|
||||
TEST_EQUAL( PSA_KEY_LIFETIME_GET_PERSISTENCE( lifetime ), persistence );
|
||||
TEST_EQUAL( PSA_KEY_LIFETIME_GET_LOCATION( lifetime ), location );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user