Refine test code and test scripts

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-11-23 08:49:51 +00:00
parent 07c554748a
commit ff5f6c8bb0
2 changed files with 7 additions and 5 deletions

View file

@ -1534,10 +1534,12 @@ int main( int argc, char *argv[] )
{
sig_alg_list[i++] = MBEDTLS_TLS13_SIG_ECDSA_SECP521R1_SHA512;
}
else if( strcmp( q, "rsa_pkcs1_sha256" ) == 0 )
#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
else if( strcmp( q, "rsa_pss_rsae_sha256" ) == 0 )
{
sig_alg_list[i++] = MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA1;
sig_alg_list[i++] = MBEDTLS_TLS13_SIG_RSA_PSS_RSAE_SHA256;
}
#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
else
{
mbedtls_printf( "unknown signature algorithm %s\n", q );
@ -1545,7 +1547,9 @@ int main( int argc, char *argv[] )
mbedtls_printf( "ecdsa_secp256r1_sha256 " );
mbedtls_printf( "ecdsa_secp384r1_sha384 " );
mbedtls_printf( "ecdsa_secp521r1_sha512 " );
mbedtls_printf( "rsa_pkcs1_sha256 " );
#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
mbedtls_printf( "rsa_pss_rsae_sha256 " );
#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
mbedtls_printf( "\n" );
goto exit;
}

View file

@ -2613,8 +2613,6 @@ component_test_tls13_experimental_with_everest () {
component_test_tls13_experimental_with_rsa () {
msg "default config with MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL enabled, with rsa"
scripts/config.py set MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL
scripts/config.py unset MBEDTLS_SSL_USE_MPS
scripts/config.py unset MBEDTLS_SSL_SRV_C
scripts/config.py set MBEDTLS_SSL_CLI_C
scripts/config.py set MBEDTLS_RSA_C
scripts/config.py set MBEDTLS_X509_RSASSA_PSS_SUPPORT