summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-08-31 14:32:51 +0100
committerMatt Caswell <matt@openssl.org>2017-08-31 15:03:35 +0100
commit0ef2802165706016698d6984dfcb2980881f18e5 (patch)
treee8e2a68cbe3484327102bc551cd17728ff36dfb0 /doc
parent57dee9bb684268aa434a2bfe7ff4743a14a62ff0 (diff)
Various review fixes for PSK early_data support
Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/3926)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/SSL_SESSION_get0_hostname.pod5
-rw-r--r--doc/man3/SSL_read_early_data.pod4
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/man3/SSL_SESSION_get0_hostname.pod b/doc/man3/SSL_SESSION_get0_hostname.pod
index 642daaa531..f0f02d32a2 100644
--- a/doc/man3/SSL_SESSION_get0_hostname.pod
+++ b/doc/man3/SSL_SESSION_get0_hostname.pod
@@ -37,8 +37,9 @@ session and its associated length in bytes. The returned value of B<*alpn> is a
pointer to memory maintained within B<s> and should not be free'd.
SSL_SESSION_set1_alpn_selected() sets the ALPN protocol for this session to the
-value in B<*alpn> which should be of length B<len> bytes. A copy of this value
-is taken.
+value in B<alpn> which should be of length B<len> bytes. A copy of the input
+value is made, and the caller retains ownership of the memory pointed to by
+B<alpn>.
=head1 SEE ALSO
diff --git a/doc/man3/SSL_read_early_data.pod b/doc/man3/SSL_read_early_data.pod
index a593b147b8..10736841a1 100644
--- a/doc/man3/SSL_read_early_data.pod
+++ b/doc/man3/SSL_read_early_data.pod
@@ -63,7 +63,9 @@ will return the maximum number of early data bytes that can be sent.
The function SSL_SESSION_set_max_early_data() sets the maximum number of early
data bytes that can be sent for a session. This would typically be used when
-creating a PSK session file (see L<SSL_CTX_set_psk_use_session_callback(3)>).
+creating a PSK session file (see L<SSL_CTX_set_psk_use_session_callback(3)>). If
+using a ticket based PSK then this is set automatically to the value provided by
+the server.
A client uses the function SSL_write_early_data() to send early data. This
function is similar to the L<SSL_write_ex(3)> function, but with the following