Use MBEDTLS_SSL_CONTEXT_SERIALIZATION flag

This commit is contained in:
Jarno Lamsa 2019-06-04 11:06:31 +03:00
parent 5a3a16cb1b
commit bbc7b41903
2 changed files with 20 additions and 3 deletions

View file

@ -344,6 +344,13 @@ int main( void )
#define USAGE_ECRESTART "" #define USAGE_ECRESTART ""
#endif #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 \ #define USAGE \
"\n usage: ssl_client2 param=<>...\n" \ "\n usage: ssl_client2 param=<>...\n" \
"\n acceptable parameters:\n" \ "\n acceptable parameters:\n" \
@ -413,7 +420,7 @@ int main( void )
" configuration macro is defined and 1\n" \ " configuration macro is defined and 1\n" \
" otherwise. The expansion of the macro\n" \ " otherwise. The expansion of the macro\n" \
" is printed if it is defined\n" \ " is printed if it is defined\n" \
" serialize=%%d default: 0 (do not serialize/deserialize)\n" \ USAGE_SERIALIZATION \
" acceptable ciphersuite names:\n" " acceptable ciphersuite names:\n"
#define ALPN_LIST_SIZE 10 #define ALPN_LIST_SIZE 10
@ -2909,6 +2916,7 @@ send_request:
/* /*
* 7c. Simulate serialize/deserialize and go back to data exchange * 7c. Simulate serialize/deserialize and go back to data exchange
*/ */
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
if( opt.serialize != 0) if( opt.serialize != 0)
{ {
size_t len; size_t len;
@ -2951,7 +2959,7 @@ send_request:
goto exit; goto exit;
} }
} }
#endif
/* /*
* 7d. Continue doing data exchanges? * 7d. Continue doing data exchanges?

View file

@ -437,6 +437,13 @@ int main( void )
#define USAGE_CURVES "" #define USAGE_CURVES ""
#endif #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 \ #define USAGE \
"\n usage: ssl_server2 param=<>...\n" \ "\n usage: ssl_server2 param=<>...\n" \
"\n acceptable parameters:\n" \ "\n acceptable parameters:\n" \
@ -501,7 +508,7 @@ int main( void )
" configuration macro is defined and 1\n" \ " configuration macro is defined and 1\n" \
" otherwise. The expansion of the macro\n" \ " otherwise. The expansion of the macro\n" \
" is printed if it is defined\n" \ " is printed if it is defined\n" \
" serialize=%%d default: 0 (do not serialize/deserialize)\n" \ USAGE_SERIALIZATION \
" acceptable ciphersuite names:\n" " acceptable ciphersuite names:\n"
#define ALPN_LIST_SIZE 10 #define ALPN_LIST_SIZE 10
@ -3920,6 +3927,7 @@ data_exchange:
/* /*
* 7b. Simulate serialize/deserialize and go back to data exchange * 7b. Simulate serialize/deserialize and go back to data exchange
*/ */
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
if( opt.serialize != 0) if( opt.serialize != 0)
{ {
size_t len; size_t len;
@ -3962,6 +3970,7 @@ data_exchange:
goto exit; goto exit;
} }
} }
#endif
/* /*
* 7c. Continue doing data exchanges? * 7c. Continue doing data exchanges?