diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 6e6cd471a..d6724dfb1 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1602,24 +1602,7 @@ int main( int argc, char *argv[] ) { ret = -1; mbedtls_printf( "unknown signature algorithm \"%s\"\n", q ); - mbedtls_printf( "supported signature algorithms:\n" ); - mbedtls_printf("\trsa_pkcs1_sha256 "); - mbedtls_printf("rsa_pkcs1_sha384 "); - mbedtls_printf("rsa_pkcs1_sha512\n"); - mbedtls_printf("\tecdsa_secp256r1_sha256 "); - mbedtls_printf("ecdsa_secp384r1_sha384 "); - mbedtls_printf("ecdsa_secp521r1_sha512\n"); - mbedtls_printf("\trsa_pss_rsae_sha256 "); - mbedtls_printf("rsa_pss_rsae_sha384 "); - mbedtls_printf("rsa_pss_rsae_sha512\n"); - mbedtls_printf("\trsa_pss_pss_sha256 "); - mbedtls_printf("rsa_pss_pss_sha384 "); - mbedtls_printf("rsa_pss_pss_sha512\n"); - mbedtls_printf("\ted25519 "); - mbedtls_printf("ed448 "); - mbedtls_printf("rsa_pkcs1_sha1 "); - mbedtls_printf("ecdsa_sha1\n"); - mbedtls_printf( "\n" ); + mbedtls_print_supported_sig_algs(); goto exit; } } diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 769f8c6a6..f74ae65ab 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -2438,24 +2438,7 @@ int main( int argc, char *argv[] ) { ret = -1; mbedtls_printf( "unknown signature algorithm \"%s\"\n", q ); - mbedtls_printf( "supported signature algorithms:\n" ); - mbedtls_printf("\trsa_pkcs1_sha256 "); - mbedtls_printf("rsa_pkcs1_sha384 "); - mbedtls_printf("rsa_pkcs1_sha512\n"); - mbedtls_printf("\tecdsa_secp256r1_sha256 "); - mbedtls_printf("ecdsa_secp384r1_sha384 "); - mbedtls_printf("ecdsa_secp521r1_sha512\n"); - mbedtls_printf("\trsa_pss_rsae_sha256 "); - mbedtls_printf("rsa_pss_rsae_sha384 "); - mbedtls_printf("rsa_pss_rsae_sha512\n"); - mbedtls_printf("\trsa_pss_pss_sha256 "); - mbedtls_printf("rsa_pss_pss_sha384 "); - mbedtls_printf("rsa_pss_pss_sha512\n"); - mbedtls_printf("\ted25519 "); - mbedtls_printf("ed448 "); - mbedtls_printf("rsa_pkcs1_sha1 "); - mbedtls_printf("ecdsa_sha1\n"); - mbedtls_printf( "\n" ); + mbedtls_print_supported_sig_algs(); goto exit; } } diff --git a/programs/ssl/ssl_test_common_source.c b/programs/ssl/ssl_test_common_source.c index a155cebd8..72c0b3ae3 100644 --- a/programs/ssl/ssl_test_common_source.c +++ b/programs/ssl/ssl_test_common_source.c @@ -350,3 +350,25 @@ int x509_crt_verify_info( char *buf, size_t size, const char *prefix, #endif /* MBEDTLS_X509_REMOVE_INFO */ } #endif /* MBEDTLS_X509_CRT_PARSE_C */ + +void mbedtls_print_supported_sig_algs( void ) +{ + mbedtls_printf( "supported signature algorithms:\n" ); + mbedtls_printf("\trsa_pkcs1_sha256 "); + mbedtls_printf("rsa_pkcs1_sha384 "); + mbedtls_printf("rsa_pkcs1_sha512\n"); + mbedtls_printf("\tecdsa_secp256r1_sha256 "); + mbedtls_printf("ecdsa_secp384r1_sha384 "); + mbedtls_printf("ecdsa_secp521r1_sha512\n"); + mbedtls_printf("\trsa_pss_rsae_sha256 "); + mbedtls_printf("rsa_pss_rsae_sha384 "); + mbedtls_printf("rsa_pss_rsae_sha512\n"); + mbedtls_printf("\trsa_pss_pss_sha256 "); + mbedtls_printf("rsa_pss_pss_sha384 "); + mbedtls_printf("rsa_pss_pss_sha512\n"); + mbedtls_printf("\ted25519 "); + mbedtls_printf("ed448 "); + mbedtls_printf("rsa_pkcs1_sha1 "); + mbedtls_printf("ecdsa_sha1\n"); + mbedtls_printf( "\n" ); +} \ No newline at end of file