commit 076b2d062f4e33776be5d05795386c341d71c4e1
author Yanray Wang <yanray.wang@arm.com> Fri Oct 21 11:09:45 2022 +0800
committer Yanray Wang <yanray.wang@arm.com> Fri Oct 21 11:22:44 2022 +0800
tree ae5ddc4fc85920789c00010b9fa7127962323115
parent ff4181e2460f6370d46caf16e2d1b3ecd729153a

Improve the method of printing string build version

Following changes are introduced with this commit:
- Call mbedtls_version_get_string before printing string
  build version instead of printing macro directly
- Output build version in the beginning of ssl_client2 program

Signed-off-by: Yanray Wang <yanray.wang@arm.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 59a96d2..ae4bb57 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -26,7 +26,6 @@
 #endif /* MBEDTLS_USE_PSA_CRYPTO || MBEDTLS_SSL_PROTO_TLS1_3 */
 
 #if defined(MBEDTLS_VERSION_C)
-#include "mbedtls/build_info.h"
 #include "mbedtls/version.h"
 #endif /* MBEDTLS_VERSION_C */
 
@@ -1003,9 +1002,11 @@
         {
             if( strcmp( q, "1" ) == 0 )
             {
+                char version_str[10];
+                memset( version_str, 0, 10 );
+                mbedtls_version_get_string( version_str );
                 mbedtls_printf( "build version: %s (build %u)\n",
-                                MBEDTLS_VERSION_STRING,
-                                mbedtls_version_get_number() );
+                                version_str, mbedtls_version_get_number() );
                 goto exit;
             }
         }
@@ -1722,6 +1723,14 @@
     }
 #endif /* MBEDTLS_SSL_ALPN */
 
+#if defined(MBEDTLS_VERSION_C)
+    char version_str[10];
+    memset( version_str, 0, 10 );
+    mbedtls_version_get_string( version_str );
+    mbedtls_printf( "build version: %s (build %u)\n",
+                    version_str, mbedtls_version_get_number() );
+#endif /* MBEDTLS_VERSION_C */
+
     /*
      * 0. Initialize the RNG and the session data
      */
@@ -2480,11 +2489,6 @@
         }
     }
 
-#if defined(MBEDTLS_VERSION_C)
-    mbedtls_printf( "build version: %s (build %u)\n",
-                    MBEDTLS_VERSION_STRING, mbedtls_version_get_number() );
-#endif /* MBEDTLS_VERSION_C */
-
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     /*
      * 5. Verify the server certificate