The branch OpenSSL_1_1_1-stable has been updated
via ac4f465406ced9601cb8c9cb800ad9a37e61b6da (commit)
from 4b7097025305b219694dd8b04f84155cd12fb71d (commit)
- Log -----------------------------------------------------------------
commit ac4f465406ced9601cb8c9cb800ad9a37e61b6da
Author: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
Date: Sat Apr 25 23:57:00 2020 +0200
doc: Random spellchecking
A little spell checking.
Backport of commit
af0d413654d19 ("doc: Random spellchecking")
Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
Reviewed-by: Kurt Roeckx <k...@roeckx.be>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
GH: #12075
-----------------------------------------------------------------------
Summary of changes:
doc/man1/s_client.pod | 2 +-
doc/man1/s_time.pod | 2 +-
doc/man3/SSL_CTX_set_tlsext_servername_callback.pod | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index 68a152a272..86cc295691 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -788,7 +788,7 @@ for an appropriate page.
If a certificate is specified on the command line using the B<-cert>
option it will not be used unless the server specifically requests
-a client certificate. Therefor merely including a client certificate
+a client certificate. Therefore merely including a client certificate
on the command line is no guarantee that the certificate works.
If there are problems verifying a server certificate then the
diff --git a/doc/man1/s_time.pod b/doc/man1/s_time.pod
index e1a3bef41c..04cae196a5 100644
--- a/doc/man1/s_time.pod
+++ b/doc/man1/s_time.pod
@@ -184,7 +184,7 @@ send an HTTP request for an appropriate page.
If a certificate is specified on the command line using the B<-cert>
option it will not be used unless the server specifically requests
-a client certificate. Therefor merely including a client certificate
+a client certificate. Therefore merely including a client certificate
on the command line is no guarantee that the certificate works.
=head1 BUGS
diff --git a/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
b/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
index e971035734..160a7343c3 100644
--- a/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
@@ -88,7 +88,7 @@ Otherwise it returns NULL.
=item On the client, during or after the handshake and a TLSv1.2 (or below)
resumption occurred
-If the session from the orignal handshake had a servername accepted by the
+If the session from the original handshake had a servername accepted by the
server then it will return that servername.
Otherwise it returns the servername set via SSL_set_tlsext_host_name() or NULL
@@ -157,12 +157,12 @@ corner cases. This has been fixed from OpenSSL 1.1.1e.
Prior to 1.1.1e, when the client requested a servername in an initial TLSv1.2
handshake, the server accepted it, and then the client successfully resumed but
-set a different explict servername in the second handshake then when called by
+set a different explicit servername in the second handshake then when called by
the client it returned the servername from the second handshake. This has now
been changed to return the servername requested in the original handshake.
Also prior to 1.1.1e, if the client sent a servername in the first handshake
but
-the server did not accept it, and then a second handshake occured where TLSv1.2
+the server did not accept it, and then a second handshake occurred where
TLSv1.2
resumption was successful then when called by the server it returned the
servername requested in the original handshake. This has now been changed to
NULL.
