commit cf1b6724c9683ea6d8918f40412370f09a8d23a8
author Jarno Lamsa <jarno.lamsa@arm.com> Tue Jun 04 11:06:31 2019 +0300
committer Jarno Lamsa <jarno.lamsa@arm.com> Tue Jun 18 11:50:11 2019 +0300
tree 93ea96b5e172f03c1e023f215adb5a0a713a832e
parent f457293b57917aa9848af62d4d93ee7a3bbb90ad

Use MBEDTLS_SSL_CONTEXT_SERIALIZATION flag

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 79900be..2026f83 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -280,6 +280,13 @@
 #define USAGE_ECRESTART ""
 #endif
 
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
+#define USAGE_SERIALIZATION \
+    "    serialize=%%d        default: 0 (do not serialize/deserialize)\n"
+#else
+#define USAGE_SERIALIZATION ""
+#endif
+
 #define USAGE \
     "\n usage: ssl_client2 param=<>...\n"                   \
     "\n acceptable parameters:\n"                           \
@@ -344,7 +351,7 @@
     "                                configuration macro is defined and 1\n"  \
     "                                otherwise. The expansion of the macro\n" \
     "                                is printed if it is defined\n"     \
-    "    serialize=%%d        default: 0 (do not serialize/deserialize)\n" \
+    USAGE_SERIALIZATION                                     \
     " acceptable ciphersuite names:\n"
 
 #define ALPN_LIST_SIZE  10
@@ -2355,6 +2362,7 @@
     /*
      * 7c. Simulate serialize/deserialize and go back to data exchange
      */
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     if( opt.serialize != 0)
     {
         size_t len;
@@ -2397,7 +2405,7 @@
             goto exit;
         }
     }
-
+#endif
 
     /*
      * 7d. Continue doing data exchanges?

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 7af5c68..5c640ab 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -385,6 +385,13 @@
 #define USAGE_CURVES ""
 #endif
 
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
+#define USAGE_SERIALIZATION \
+    "    serialize=%%d        default: 0 (do not serialize/deserialize)\n"
+#else
+#define USAGE_SERIALIZATION ""
+#endif
+
 #define USAGE \
     "\n usage: ssl_server2 param=<>...\n"                   \
     "\n acceptable parameters:\n"                           \
@@ -446,7 +453,7 @@
     "                                configuration macro is defined and 1\n"  \
     "                                otherwise. The expansion of the macro\n" \
     "                                is printed if it is defined\n"     \
-    "    serialize=%%d        default: 0 (do not serialize/deserialize)\n" \
+    USAGE_SERIALIZATION                                     \
     " acceptable ciphersuite names:\n"
 
 
@@ -3340,6 +3347,7 @@
     /*
      * 7b. Simulate serialize/deserialize and go back to data exchange
      */
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     if( opt.serialize != 0)
     {
         size_t len;
@@ -3382,6 +3390,7 @@
             goto exit;
         }
     }
+#endif
 
     /*
      * 7c. Continue doing data exchanges?