root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Add a -max_early_data option to s_server 

Allows you to set the number of bytes that can be sent as early data

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)
This commit is contained in:
Matt Caswell 2017-02-17 17:01:16 +00:00
parent 3fc8d85610
commit 048b189336
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/s_server.c
View File

@ -719,7 +719,7 @@ typedef enum OPTION_choice {
OPT_ID_PREFIX, OPT_RAND, OPT_SERVERNAME, OPT_SERVERNAME_FATAL, OPT_ID_PREFIX, OPT_RAND, OPT_SERVERNAME, OPT_SERVERNAME_FATAL,
OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN,
OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN,
OPT_KEYLOG_FILE, OPT_KEYLOG_FILE, OPT_MAX_EARLY,
OPT_S_ENUM, OPT_S_ENUM,
OPT_V_ENUM, OPT_V_ENUM,
OPT_X_ENUM OPT_X_ENUM
@ -916,6 +916,8 @@ const OPTIONS s_server_options[] = {
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
#endif #endif
{"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"}, {"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"},
{"max_early_data", OPT_MAX_EARLY, 'p',
"The maximum number of bytes of early data"},
{NULL, OPT_EOF, 0, NULL} {NULL, OPT_EOF, 0, NULL}
}; };
@ -992,6 +994,7 @@ int s_server_main(int argc, char *argv[])
unsigned int split_send_fragment = 0, max_pipelines = 0; unsigned int split_send_fragment = 0, max_pipelines = 0;
const char *s_serverinfo_file = NULL; const char *s_serverinfo_file = NULL;
const char *keylog_file = NULL; const char *keylog_file = NULL;
uint32_t max_early_data = 0;
/* Init of few remaining global variables */ /* Init of few remaining global variables */
local_argc = argc; local_argc = argc;
@ -1500,7 +1503,9 @@ int s_server_main(int argc, char *argv[])
case OPT_KEYLOG_FILE: case OPT_KEYLOG_FILE:
keylog_file = opt_arg(); keylog_file = opt_arg();
break; break;
case OPT_MAX_EARLY:
max_early_data = atoi(opt_arg());
break;
} }
} }
argc = opt_num_rest(); argc = opt_num_rest();
@ -1991,6 +1996,9 @@ int s_server_main(int argc, char *argv[])
if (set_keylog_file(ctx, keylog_file)) if (set_keylog_file(ctx, keylog_file))
goto end; goto end;
if (max_early_data > 0)
SSL_CTX_set_max_early_data(ctx, max_early_data);
BIO_printf(bio_s_out, "ACCEPT\n"); BIO_printf(bio_s_out, "ACCEPT\n");
(void)BIO_flush(bio_s_out); (void)BIO_flush(bio_s_out);
if (rev) if (rev)