commit 202919c23d11e65ee23d019afaddbe68596bc6a5
author Jerry Yu <jerry.h.yu@arm.com> Mon Jun 27 16:21:00 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Wed Jun 29 16:18:29 2022 +0800
tree 30f1243b0d1784744ae2524e497f37181620cda3
parent ee28e7a21d013c7f4d18ad14713257af9491b518

refine supported sig alg print

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 6e6cd47..d6724df 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1602,24 +1602,7 @@
             {
                 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;
             }
         }

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 769f8c6..f74ae65 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -2438,24 +2438,7 @@
             {
                 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;
             }
         }

programs/ssl/ssl_test_common_source.c

diff --git a/programs/ssl/ssl_test_common_source.c b/programs/ssl/ssl_test_common_source.c
index a155ceb..72c0b3a 100644
--- a/programs/ssl/ssl_test_common_source.c
+++ b/programs/ssl/ssl_test_common_source.c
@@ -350,3 +350,25 @@
 #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