From 7ffb7fbe8c1c1bc467993389478d2ea6f00e1860 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 4 Dec 2018 12:31:17 +0000 Subject: [PATCH] Document the num_tickets s_server option Fixes #7727 Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/7756) --- doc/man1/s_server.pod | 10 +++++++++- doc/man3/SSL_CTX_set_num_tickets.pod | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod index 5a18343a8a..80b82de135 100644 --- a/doc/man1/s_server.pod +++ b/doc/man1/s_server.pod @@ -98,6 +98,7 @@ B B [B<-no_comp>] [B<-comp>] [B<-no_ticket>] +[B<-num_tickets>] [B<-serverpref>] [B<-legacy_renegotiation>] [B<-no_renegotiation>] @@ -558,7 +559,14 @@ OpenSSL 1.1.0. =item B<-no_ticket> -Disable RFC4507bis session ticket support. +Disable RFC4507bis session ticket support. This option has no effect if TLSv1.3 +is negotiated. See B<-num_tickets>. + +=item B<-num_tickets> + +Control the number of tickets that will be sent to the client after a full +handshake in TLSv1.3. The default number of tickets is 2. This option does not +affect the number of tickets sent after a resumption handshake. =item B<-serverpref> diff --git a/doc/man3/SSL_CTX_set_num_tickets.pod b/doc/man3/SSL_CTX_set_num_tickets.pod index 3975afd8e9..d6e0ae1c1e 100644 --- a/doc/man3/SSL_CTX_set_num_tickets.pod +++ b/doc/man3/SSL_CTX_set_num_tickets.pod @@ -20,10 +20,10 @@ SSL_CTX_get_num_tickets =head1 DESCRIPTION SSL_CTX_set_num_tickets() and SSL_set_num_tickets() can be called for a server -application and set the number of session tickets that will be sent to the -client after a full handshake. Set the desired value (which could be 0) in the -B argument. Typically these functions should be called before the -start of the handshake. +application and set the number of TLSv1.3 session tickets that will be sent to +the client after a full handshake. Set the desired value (which could be 0) in +the B argument. Typically these functions should be called before +the start of the handshake. The default number of tickets is 2; the default number of tickets sent following a resumption handshake is 1 but this cannot be changed using these functions. -- 2.25.1