[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Mon Apr 27 23:06:39 UTC 2020
The branch master has been updated
via af0d413654d19acab7c8af0a3f0b3bac0574fe33 (commit)
from 60ebc0ca5a829e2ae939a9ab13658af202b6dfc7 (commit)
- Log -----------------------------------------------------------------
commit af0d413654d19acab7c8af0a3f0b3bac0574fe33
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date: Sat Apr 25 23:57:00 2020 +0200
doc: Random spellchecking
A little spell checking.
Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11644)
-----------------------------------------------------------------------
Summary of changes:
doc/man1/openssl-s_client.pod.in | 2 +-
doc/man1/openssl-s_time.pod.in | 2 +-
doc/man1/openssl.pod | 2 +-
doc/man3/SSL_CTX_set_tlsext_servername_callback.pod | 6 +++---
doc/man3/X509_STORE_CTX_get_error.pod | 6 +++---
doc/man3/X509_load_http.pod | 4 ++--
doc/man3/s2i_ASN1_IA5STRING.pod | 2 +-
doc/man7/provider-signature.pod | 6 +++---
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in
index 42cff1f57a..5f04358a84 100644
--- a/doc/man1/openssl-s_client.pod.in
+++ b/doc/man1/openssl-s_client.pod.in
@@ -850,7 +850,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/openssl-s_time.pod.in b/doc/man1/openssl-s_time.pod.in
index dd4029d4af..0f9f055591 100644
--- a/doc/man1/openssl-s_time.pod.in
+++ b/doc/man1/openssl-s_time.pod.in
@@ -164,7 +164,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/man1/openssl.pod b/doc/man1/openssl.pod
index 9bac3cd432..1cdcd8b8bb 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -1124,7 +1124,7 @@ values larger than 127, as described in B<esc_ctrl>.
Escapes some characters by surrounding the entire string with quotation
marks, C<">.
-Without this option, individual special characters are preceeded with
+Without this option, individual special characters are preceded with
a backslash character, C<\>.
=item B<utf8>
diff --git a/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod b/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod
index 374f575b45..0c271b1f11 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.
diff --git a/doc/man3/X509_STORE_CTX_get_error.pod b/doc/man3/X509_STORE_CTX_get_error.pod
index 0c0d01b888..ce69e4da45 100644
--- a/doc/man3/X509_STORE_CTX_get_error.pod
+++ b/doc/man3/X509_STORE_CTX_get_error.pod
@@ -327,7 +327,7 @@ Unhandled critical CRL extension.
Invalid non-CA certificate has CA markings.
-=item B<X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED: proxy path length contraint exceeded>
+=item B<X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED: proxy path length constraint exceeded>
Proxy path length constraint exceeded.
@@ -340,7 +340,7 @@ certificates.
Proxy certificates not allowed unless the B<-allow_proxy_certs> option is used.
-=item B<X509_V_ERR_UNNESTED_RESOURCE: RFC 3779 resource not subset of parent's resrouces>
+=item B<X509_V_ERR_UNNESTED_RESOURCE: RFC 3779 resource not subset of parent's resources>
See RFC 3779 for details.
@@ -415,7 +415,7 @@ recognized by the OCSP responder.
The issuer certificate does not have a public key.
-=item B<X509_V_ERROR_SIGNATURE_ALGORITHM_MISMATCH, Subject signature algorithm and issuer public key algoritm mismatch>
+=item B<X509_V_ERROR_SIGNATURE_ALGORITHM_MISMATCH, Subject signature algorithm and issuer public key algorithm mismatch>
The issuer's public key is not of the type required by the signature in
the subject's certificate.
diff --git a/doc/man3/X509_load_http.pod b/doc/man3/X509_load_http.pod
index d30253d5ee..483597b5b8 100644
--- a/doc/man3/X509_load_http.pod
+++ b/doc/man3/X509_load_http.pod
@@ -24,7 +24,7 @@ X509_load_http() and X509_CRL_load_http() loads a certificate or a CRL,
respectively, in ASN.1 format using HTTP from the given B<url>.
If B<bio> is given and B<rbio> is NULL then this BIO is used instead of an
-interal one for connecting, writing the request, and reading the response.
+internal one for connecting, writing the request, and reading the response.
If both B<bio> and B<rbio> are given (which may be memory BIOs, for instance)
then no explicit connection is attempted,
B<bio> is used for writing the request, and B<rbio> for reading the response.
@@ -36,7 +36,7 @@ while a value < 0 immediately leads to a timeout condition.
X509_http_nbio() and X509_CRL_http_nbio() are macros for backward compatibility
that have the same effect as the functions above but with infinite timeout
-and without the possiblity to specify custom BIOs.
+and without the possibility to specify custom BIOs.
=head1 RETURN VALUES
diff --git a/doc/man3/s2i_ASN1_IA5STRING.pod b/doc/man3/s2i_ASN1_IA5STRING.pod
index 08fa984af1..e59a85606b 100644
--- a/doc/man3/s2i_ASN1_IA5STRING.pod
+++ b/doc/man3/s2i_ASN1_IA5STRING.pod
@@ -32,7 +32,7 @@ i2s_ASN1_ENUMERATED_TABLE,
=head1 DESCRIPTION
These functions convert OpenSSL objects to and from their ASN.1/string
-representation. This function is used for B<X509v3> extentions.
+representation. This function is used for B<X509v3> extensions.
=head1 NOTES
diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod
index 9396b4a898..45d97e668c 100644
--- a/doc/man7/provider-signature.pod
+++ b/doc/man7/provider-signature.pod
@@ -253,7 +253,7 @@ although this may be ignored by providers.
OP_signature_digest_sign_update() provides data to be signed in the I<data>
parameter which should be of length I<datalen>. A previously initialised
signature context is passed in the I<ctx> parameter. This function may be called
-multiple times to cummulatively add data to be signed.
+multiple times to cumulatively add data to be signed.
OP_signature_digest_sign_final() finalises a signature operation previously
started through OP_signature_digest_sign_init() and
@@ -288,7 +288,7 @@ although this may be ignored by providers.
OP_signature_digest_verify_update() provides data to be verified in the I<data>
parameter which should be of length I<datalen>. A previously initialised
verification context is passed in the I<ctx> parameter. This function may be
-called multiple times to cummulatively add data to be verified.
+called multiple times to cumulatively add data to be verified.
OP_signature_digest_verify_final() finalises a verification operation previously
started through OP_signature_digest_verify_init() and
@@ -347,7 +347,7 @@ By default it retries until a signature is calculated.
Setting the value to 0 causes the sign operation to retry,
otherwise the sign operation is only tried once and returns whether or not it
was successful.
-Known answer tests can be performed if the random generator is overriden to
+Known answer tests can be performed if the random generator is overridden to
supply known values that either pass or fail.
=back
More information about the openssl-commits
mailing list