Use a plausible input size with asymmetric verification

Otherwise the error status can be PSA_ERROR_INVALID_SIGNATURE instead of the
expected PSA_ERROR_NOT_SUPPORTED in some configurations. For example, the
RSA verification code currently checks the signature size first whenever
PSA_KEY_TYPE_RSA_PUBLIC_KEY is enabled, and only gets into
algorithm-specific code if this passes, so it returns INVALID_SIGNATURE even
if the specific algorithm is not supported.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-03-15 19:51:53 +01:00
parent e6300959df
commit b24ed5261e

View file

@ -240,10 +240,20 @@ void sign_fail( int key_type_arg, data_t *key_data,
output, sizeof( output ), &length ) ); output, sizeof( output ), &length ) );
if( ! private_only ) if( ! private_only )
{ {
/* Determine a plausible signature size to avoid an INVALID_SIGNATURE
* error based on this. */
PSA_ASSERT( psa_get_key_attributes( key_id, &attributes ) );
size_t key_bits = psa_get_key_bits( &attributes );
size_t output_length = sizeof( output );
if( PSA_KEY_TYPE_IS_RSA( key_type ) )
output_length = PSA_BITS_TO_BYTES( key_bits );
else if( PSA_KEY_TYPE_IS_ECC( key_type ) )
output_length = 2 * PSA_BITS_TO_BYTES( key_bits );
TEST_ASSERT( output_length <= sizeof( output ) );
TEST_STATUS( expected_status, TEST_STATUS( expected_status,
psa_verify_hash( key_id, alg, psa_verify_hash( key_id, alg,
input, sizeof( input ), input, sizeof( input ),
output, sizeof( output ) ) ); output, output_length ) );
} }
exit: exit: