[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c549cb46e0d3cb4e611acafae5f919b4a8df4007 (commit)
      from  2d3c5ee161627ebc31dd311f3361bcb088b36542 (commit)


- Log -----------------------------------------------------------------
commit c549cb46e0d3cb4e611acafae5f919b4a8df4007
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Oct 23 19:32:05 2019 +0100

    Fix a copy&paste error in the TLSv1.3 server side PSK documentation
    
    The introductory paragraph for the TLSv1.3 server side PSK documentation
    is a copy & paste of the client side documentation which has not been
    updated with the server side equivalent information.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10245)

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

Summary of changes:
 doc/man3/SSL_CTX_use_psk_identity_hint.pod | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/man3/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
index 2335dc4061..80bae5bba7 100644
--- a/doc/man3/SSL_CTX_use_psk_identity_hint.pod
+++ b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
@@ -39,9 +39,9 @@ SSL_set_psk_find_session_callback
 
 =head1 DESCRIPTION
 
-A client application wishing to use TLSv1.3 PSKs should set a callback
-using either SSL_CTX_set_psk_use_session_callback() or
-SSL_set_psk_use_session_callback() as appropriate.
+A server application wishing to use TLSv1.3 PSKs should set a callback
+using either SSL_CTX_set_psk_find_session_callback() or
+SSL_set_psk_find_session_callback() as appropriate.
 
 The callback function is given a pointer to the SSL connection in B<ssl> and
 an identity in B<identity> of length B<identity_len>. The callback function