From bbc7b419030209ec07dabb7b69a950b91d1ff00f Mon Sep 17 00:00:00 2001
From: Jarno Lamsa <jarno.lamsa@arm.com>
Date: Tue, 4 Jun 2019 11:06:31 +0300
Subject: [PATCH] Use MBEDTLS_SSL_CONTEXT_SERIALIZATION flag

---
 programs/ssl/ssl_client2.c | 12 ++++++++++--
 programs/ssl/ssl_server2.c | 11 ++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 435546679..1efa83afa 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -344,6 +344,13 @@ int main( void )
 #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"                           \
@@ -413,7 +420,7 @@ int main( void )
     "                                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
@@ -2909,6 +2916,7 @@ send_request:
     /*
      * 7c. Simulate serialize/deserialize and go back to data exchange
      */
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     if( opt.serialize != 0)
     {
         size_t len;
@@ -2951,7 +2959,7 @@ send_request:
             goto exit;
         }
     }
-
+#endif
 
     /*
      * 7d. Continue doing data exchanges?
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 58447e5e9..090340f19 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -437,6 +437,13 @@ int main( void )
 #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"                           \
@@ -501,7 +508,7 @@ int main( void )
     "                                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
@@ -3920,6 +3927,7 @@ data_exchange:
     /*
      * 7b. Simulate serialize/deserialize and go back to data exchange
      */
+#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     if( opt.serialize != 0)
     {
         size_t len;
@@ -3962,6 +3970,7 @@ data_exchange:
             goto exit;
         }
     }
+#endif
 
     /*
      * 7c. Continue doing data exchanges?