[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  25ead551aa31feae91cab91b648a2ca16bc7a8dc (commit)
      from  8b09a9c76d873f62c2507fa9628a9c96c1d66d5c (commit)


- Log -----------------------------------------------------------------
commit 25ead551aa31feae91cab91b648a2ca16bc7a8dc
Author: Kinshuk Dua <kinshukdua at gmail.com>
Date:   Thu Oct 21 18:47:53 2021 +0530

    Doc: be explicit about NUL in max_identity_len
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16877)

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

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

diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
index 23bab17317..dd302983fd 100644
--- a/doc/man3/SSL_CTX_set_psk_client_callback.pod
+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod
@@ -107,11 +107,11 @@ the pre-shared key to use during the connection setup phase.
 
 The callback is set using functions SSL_CTX_set_psk_client_callback()
 or SSL_set_psk_client_callback(). The callback function is given the
-connection in parameter B<ssl>, a B<NULL>-terminated PSK identity hint
+connection in parameter B<ssl>, a B<NUL>-terminated PSK identity hint
 sent by the server in parameter B<hint>, a buffer B<identity> of
-length B<max_identity_len> bytes where the resulting
-B<NUL>-terminated identity is to be stored, and a buffer B<psk> of
-length B<max_psk_len> bytes where the resulting pre-shared key is to
+length B<max_identity_len> bytes (including the B<NUL>-terminator) where the
+resulting B<NUL>-terminated identity is to be stored, and a buffer B<psk>
+of length B<max_psk_len> bytes where the resulting pre-shared key is to
 be stored.
 
 The callback for use in TLSv1.2 will also work in TLSv1.3 although it is