aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-19 15:03:43 +0100
committerMatt Caswell <matt@openssl.org>2017-06-21 14:45:36 +0100
commit8ead6158a961c9b86bc086fbe96c9fbbe715a8c5 (patch)
treeadec727ac9f8a1be60d2421d940e096b7d859bce /doc
parent93a048a1d8f1f6307aea0c1e7854a40b2daf236f (diff)
downloadopenssl-8ead6158a961c9b86bc086fbe96c9fbbe715a8c5.tar.gz
Document SSL_set_psk_find_session_callback() and SSL_CTX equivalent
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/SSL_CTX_set_psk_client_callback.pod2
-rw-r--r--doc/man3/SSL_CTX_use_psk_identity_hint.pod5
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
index 6a37e7df3d..7e8fffef81 100644
--- a/doc/man3/SSL_CTX_set_psk_client_callback.pod
+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod
@@ -106,7 +106,7 @@ should not be freed by the application.
It is also possible for the callback to succeed but not supply a PSK. In this
case no PSK will be sent to the server but the handshake will continue. To do
-this the callback should return successfully and ensure that the B<*sess> is
+this the callback should return successfully and ensure that B<*sess> is
NULL. The contents of B<*id> and B<*idlen> will be ignored.
=head1 NOTES
diff --git a/doc/man3/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
index 937518089d..9dd14f8e54 100644
--- a/doc/man3/SSL_CTX_use_psk_identity_hint.pod
+++ b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
@@ -77,6 +77,11 @@ case no PSK will be used but the handshake will continue. To do this the
callback should return successfully and ensure that B<*sess> is
NULL.
+=head1 NOTES
+
+A connection established via a TLSv1.3 PSK will appear as if session resumption
+has occurred so that L<SSL_session_reused(3)> will return true.
+
=head1 RETURN VALUES
SSL_CTX_use_psk_identity_hint() and SSL_use_psk_identity_hint() return