[openssl] OpenSSL_1_1_1-stable update

[tomas at openssl.org]

The branch OpenSSL_1_1_1-stable has been updated
       via  5402f96aba9dd3d0b3006b8b2651bd27d3cbf326 (commit)
      from  97a1fb5106fdb2b3dc3bbe84d0892db40e50c45f (commit)


- Log -----------------------------------------------------------------
commit 5402f96aba9dd3d0b3006b8b2651bd27d3cbf326
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Sep 11 09:58:52 2021 +0100

    Correct the documentation for SSL_set_num_tickets()
    
    The behaviour for what happens in a resumption connection was not quite
    described correctly.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16582)
    
    (cherry picked from commit 4603b782e6dbed493d2f38db111abc05df66fb99)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/SSL_CTX_set_num_tickets.pod | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man3/SSL_CTX_set_num_tickets.pod b/doc/man3/SSL_CTX_set_num_tickets.pod
index ad13ed15f4..2224b35c30 100644
--- a/doc/man3/SSL_CTX_set_num_tickets.pod
+++ b/doc/man3/SSL_CTX_set_num_tickets.pod
@@ -25,10 +25,10 @@ the client after a full handshake. Set the desired value (which could be 0) in
 the B<num_tickets> 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.
-The number of tickets following a resumption handshake can be reduced to 0 using
-custom session ticket callbacks (see L<SSL_CTX_set_session_ticket_cb(3)>).
+The default number of tickets is 2. Following a resumption the number of tickets
+issued will never be more than 1 regardless of the value set via
+SSL_set_num_tickets() or SSL_CTX_set_num_tickets(). If B<num_tickets> is set to
+0 then no tickets will be issued for either a normal connection or a resumption.
 
 Tickets are also issued on receipt of a post-handshake certificate from the
 client following a request by the server using