commit da4fba64b8602036bc72d4beb2818a42981c9f10
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Fri Jun 02 14:52:28 2023 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue Jun 06 12:31:09 2023 +0200
tree 505efd7d3dbf0014b136bbcf15c3da41e6b6ceff
parent 152bb4632b977ea48f46c35090002acbbb2b1005

Further code optimizations

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index dcf3087..eb47af1 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -466,10 +466,6 @@
     USAGE_SERIALIZATION                                                       \
     " acceptable ciphersuite names:\n"
 
-#define ALPN_LIST_SIZE    10
-#define CURVE_LIST_SIZE   25
-#define SIG_ALG_LIST_SIZE  5
-
 /*
  * global options
  */
@@ -1530,7 +1526,7 @@
                          curve_cur++) {
                         mbedtls_printf("%s ", curve_cur->name);
                     }
-                    uint16_t *supported_ffdh_group = mbedtls_ssl_ffdh_supported_groups();
+                    const uint16_t *supported_ffdh_group = mbedtls_ssl_ffdh_supported_groups();
                     while (*supported_ffdh_group != 0) {
                         mbedtls_printf("%s ",
                                        mbedtls_ssl_ffdh_name_from_group(*supported_ffdh_group));

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 9919e08..1986b35 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -587,10 +587,6 @@
     USAGE_SERIALIZATION                                                       \
     " acceptable ciphersuite names:\n"
 
-#define ALPN_LIST_SIZE    10
-#define CURVE_LIST_SIZE   25
-#define SIG_ALG_LIST_SIZE 5
-
 #define PUT_UINT64_BE(out_be, in_le, i)                                   \
     {                                                                       \
         (out_be)[(i) + 0] = (unsigned char) (((in_le) >> 56) & 0xFF);    \
@@ -2423,7 +2419,7 @@
                          curve_cur->grp_id != MBEDTLS_ECP_DP_NONE;
                          curve_cur++) {
                         mbedtls_printf("%s ", curve_cur->name);
-                        uint16_t *supported_ffdh_group = mbedtls_ssl_ffdh_supported_groups();
+                        const uint16_t *supported_ffdh_group = mbedtls_ssl_ffdh_supported_groups();
                         while (*supported_ffdh_group != 0) {
                             mbedtls_printf("%s ",
                                            mbedtls_ssl_ffdh_name_from_group(*supported_ffdh_group));

programs/ssl/ssl_test_lib.c

diff --git a/programs/ssl/ssl_test_lib.c b/programs/ssl/ssl_test_lib.c
index ea422e9..26824c2 100644
--- a/programs/ssl/ssl_test_lib.c
+++ b/programs/ssl/ssl_test_lib.c
@@ -465,9 +465,9 @@
     return 0;
 }
 
-uint16_t *mbedtls_ssl_ffdh_supported_groups(void)
+const uint16_t *mbedtls_ssl_ffdh_supported_groups(void)
 {
-    static uint16_t ffdh_groups[] = {
+    static const uint16_t ffdh_groups[] = {
         MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE2048,
         MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE3072,
         MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE4096,

programs/ssl/ssl_test_lib.h

diff --git a/programs/ssl/ssl_test_lib.h b/programs/ssl/ssl_test_lib.h
index 5f9dbdd..c2afc96 100644
--- a/programs/ssl/ssl_test_lib.h
+++ b/programs/ssl/ssl_test_lib.h
@@ -80,6 +80,10 @@
 
 #include "../test/query_config.h"
 
+#define ALPN_LIST_SIZE    10
+#define CURVE_LIST_SIZE   25
+#define SIG_ALG_LIST_SIZE  5
+
 typedef struct eap_tls_keys {
     unsigned char master_secret[48];
     unsigned char randbytes[64];
@@ -309,7 +313,7 @@
 
 /* Helper functions for FFDH groups. */
 uint16_t mbedtls_ssl_ffdh_group_from_name(const char *name);
-uint16_t *mbedtls_ssl_ffdh_supported_groups(void);
+const uint16_t *mbedtls_ssl_ffdh_supported_groups(void);
 
 #endif /* MBEDTLS_SSL_TEST_IMPOSSIBLE conditions: else */
 #endif /* MBEDTLS_PROGRAMS_SSL_SSL_TEST_LIB_H */