aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-04-26 15:14:03 +0100
committerMatt Caswell <matt@openssl.org>2017-04-26 16:46:47 +0100
commit5b3e5f00a63446a5de633277a33dc013c22e7231 (patch)
treedcd2bda3ec93755e982d5c146a0babd35f329a10
parent35ea9edfb255aa3faab69afd4f2bd2fd64dafd4b (diff)
downloadopenssl-5b3e5f00a63446a5de633277a33dc013c22e7231.tar.gz
More SSL_SESSION documentation tweaks based on feedback
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3008)
-rw-r--r--doc/man3/SSL_CTX_sess_set_get_cb.pod2
-rw-r--r--doc/man3/SSL_SESSION_is_resumable.pod4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/man3/SSL_CTX_sess_set_get_cb.pod b/doc/man3/SSL_CTX_sess_set_get_cb.pod
index d0caa8a155..55edd1c1a6 100644
--- a/doc/man3/SSL_CTX_sess_set_get_cb.pod
+++ b/doc/man3/SSL_CTX_sess_set_get_cb.pod
@@ -57,7 +57,7 @@ and session caching is enabled (see
L<SSL_CTX_set_session_cache_mode(3)>).
The new_session_cb() is passed the B<ssl> connection and the ssl session
B<sess>. If the callback returns B<0>, the session will be immediately
-removed again. Note that in TLSv1.3 sessions are established after the main
+removed again. Note that in TLSv1.3, sessions are established after the main
handshake has completed. The server decides when to send the client the session
information and this may occur some time after the end of the handshake (or not
at all). This means that applications should expect the new_session_cb()
diff --git a/doc/man3/SSL_SESSION_is_resumable.pod b/doc/man3/SSL_SESSION_is_resumable.pod
index d3fae9dd12..f0c8babdd6 100644
--- a/doc/man3/SSL_SESSION_is_resumable.pod
+++ b/doc/man3/SSL_SESSION_is_resumable.pod
@@ -15,8 +15,8 @@ SSL_SESSION_is_resumable
SSL_SESSION_is_resumable() determines whether an SSL_SESSION object can be used
to resume a session or not. Returns 1 if it can or 0 if not. Note that
-attempting to resume with a non-resumable session will result in OpenSSL
-performing a full handshake.
+attempting to resume with a non-resumable session will result in a full
+handshake.
=head1 SEE ALSO