diff options
| author | Matt Caswell <matt@openssl.org> | 2018-01-31 16:40:03 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-05-17 16:48:25 +0100 |
| commit | 394159da608f625b60f07c59e36dc7d01df3a709 (patch) | |
| tree | be53d870c3c1e277a2d94861717219148ea2fc9b /apps/s_server.c | |
| parent | 9d0a8bb71e3e411e9183e635122f17c1429c4116 (diff) | |
Allow configuation of the number of TLSv1.3 session tickets via SSL_CONF
Also allows the apps to set it.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5227)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index b0e9659b52..5d53250935 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -747,7 +747,7 @@ typedef enum OPTION_choice { OPT_ID_PREFIX, OPT_SERVERNAME, OPT_SERVERNAME_FATAL, OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, - OPT_KEYLOG_FILE, OPT_MAX_EARLY, OPT_EARLY_DATA, + OPT_KEYLOG_FILE, OPT_MAX_EARLY, OPT_EARLY_DATA, OPT_S_NUM_TICKETS, OPT_R_ENUM, OPT_S_ENUM, OPT_V_ENUM, @@ -955,6 +955,8 @@ const OPTIONS s_server_options[] = { {"max_early_data", OPT_MAX_EARLY, 'n', "The maximum number of bytes of early data"}, {"early_data", OPT_EARLY_DATA, '-', "Attempt to read early data"}, + {"num_tickets", OPT_S_NUM_TICKETS, 'n', + "The number of TLSv1.3 session tickets that a server will automatically issue" }, {NULL, OPT_EOF, 0, NULL} }; @@ -1252,6 +1254,7 @@ int s_server_main(int argc, char *argv[]) goto opthelp; break; case OPT_S_CASES: + case OPT_S_NUM_TICKETS: if (ssl_args == NULL) ssl_args = sk_OPENSSL_STRING_new_null(); if (ssl_args == NULL |