[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Sat Mar 10 21:55:39 UTC 2018
The branch master has been updated
via 3266cf582a8e1b0bd04600658f64e2c9a79cf903 (commit)
from 78a50c7524e86137e4db3d57d1a06eb573b26054 (commit)
- Log -----------------------------------------------------------------
commit 3266cf582a8e1b0bd04600658f64e2c9a79cf903
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date: Sat Mar 10 13:13:23 2018 -0500
Fixed a handful of typos
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5583)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/EVP_md5.pod | 2 +-
doc/man3/OSSL_STORE_LOADER.pod | 2 +-
doc/man3/OSSL_STORE_SEARCH.pod | 4 ++--
doc/man3/OSSL_STORE_open.pod | 4 ++--
doc/man3/SSL_CTX_set_tlsext_use_srtp.pod | 2 +-
doc/man3/UI_STRING.pod | 4 ++--
doc/man3/d2i_X509.pod | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/man3/EVP_md5.pod b/doc/man3/EVP_md5.pod
index 1048c0f..30e72a2 100644
--- a/doc/man3/EVP_md5.pod
+++ b/doc/man3/EVP_md5.pod
@@ -16,7 +16,7 @@ EVP_md5
MD5 is a cryptographic hash function standardized in RFC 1321 and designed by
Ronald Rivest.
-The CMU Software Engieneering Institute considers MD5 unsuitable for further
+The CMU Software Engineering Institute considers MD5 unsuitable for further
use since its security has been severely compromised.
=over 4
diff --git a/doc/man3/OSSL_STORE_LOADER.pod b/doc/man3/OSSL_STORE_LOADER.pod
index e6e520e..87c135a 100644
--- a/doc/man3/OSSL_STORE_LOADER.pod
+++ b/doc/man3/OSSL_STORE_LOADER.pod
@@ -162,7 +162,7 @@ It is otherwise expected to return 0.
=item B<OSSL_STORE_error_fn>
This function takes a B<OSSL_STORE_LOADER_CTX> pointer and is expected to
-return 1 to indicate that an error occured in a previous call to the
+return 1 to indicate that an error occurred in a previous call to the
B<OSSL_STORE_load_fn> function.
It is otherwise expected to return 0.
diff --git a/doc/man3/OSSL_STORE_SEARCH.pod b/doc/man3/OSSL_STORE_SEARCH.pod
index 411664d..6d36a19 100644
--- a/doc/man3/OSSL_STORE_SEARCH.pod
+++ b/doc/man3/OSSL_STORE_SEARCH.pod
@@ -45,7 +45,7 @@ OSSL_STORE_SEARCH_get0_digest
=head1 DESCRIPTION
-These functions are use to specify search criteria to help search for specific
+These functions are used to specify search criteria to help search for specific
objects through other names than just the URI that's given to OSSL_STORE_open().
For example, this can be useful for an application that has received a URI
and then wants to add on search criteria in a uniform and supported manner.
@@ -122,7 +122,7 @@ accordingly.
A criterion of this type is created with OSSL_STORE_SEARCH_by_key_fingerprint()
and the actual fingerprint and its length can be retrieved with
OSSL_STORE_SEARCH_get0_bytes().
-The digest can be retreived with OSSL_STORE_SEARCH_get0_digest().
+The digest can be retrieved with OSSL_STORE_SEARCH_get0_digest().
=item OSSL_STORE_SEARCH_BY_ALIAS
diff --git a/doc/man3/OSSL_STORE_open.pod b/doc/man3/OSSL_STORE_open.pod
index 3a05a88..92b2493 100644
--- a/doc/man3/OSSL_STORE_open.pod
+++ b/doc/man3/OSSL_STORE_open.pod
@@ -86,7 +86,7 @@ object and return it wrapped with B<OSSL_STORE_INFO>.
OSSL_STORE_eof() takes a B<OSSL_STORE_CTX> and checks if we've reached the end
of data.
-OSSL_STORE_error() takes a B<OSSL_STORE_CTX> and checks if an error occured in
+OSSL_STORE_error() takes a B<OSSL_STORE_CTX> and checks if an error occurred in
the last OSSL_STORE_load() call.
Note that it may still be meaningful to try and load more objects, unless
OSSL_STORE_eof() shows that the end of data has been reached.
@@ -125,7 +125,7 @@ returned B<NULL>.
OSSL_STORE_eof() returns 1 if the end of data has been reached, otherwise
0.
-OSSL_STORE_error() returns 1 if an error occured in a OSSL_STORE_load() call,
+OSSL_STORE_error() returns 1 if an error occurred in an OSSL_STORE_load() call,
otherwise 0.
OSSL_STORE_ctrl() and OSSL_STORE_close() returns 1 on success, or 0 on failure.
diff --git a/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod b/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
index 2746d50..2bc3a43 100644
--- a/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
@@ -75,7 +75,7 @@ SSL_get_selected_srtp_profile(). This function will return NULL if no SRTP
protection profile was negotiated. The memory returned from this function should
not be freed by the caller.
-If an SRTP protection profile has been sucessfully negotiated then the SRTP
+If an SRTP protection profile has been successfully negotiated then the SRTP
keying material (on both the client and server) should be obtained via a call to
L<SSL_export_keying_material(3)>. This call should provide a label value of
"EXTRACTOR-dtls_srtp" and a NULL context value (use_context is 0). The total
diff --git a/doc/man3/UI_STRING.pod b/doc/man3/UI_STRING.pod
index 5a464a3..09a7d0b 100644
--- a/doc/man3/UI_STRING.pod
+++ b/doc/man3/UI_STRING.pod
@@ -120,11 +120,11 @@ UI_get0_test_string() returns the UI string action description
string for B<UIT_VERIFY> type UI strings, NULL for any other type.
UI_get_result_minsize() returns the minimum allowed result size for
-the UI string for for B<UIT_PROMPT> and B<UIT_VERIFY> type strings,
+the UI string for B<UIT_PROMPT> and B<UIT_VERIFY> type strings,
-1 for any other type.
UI_get_result_maxsize() returns the minimum allowed result size for
-the UI string for for B<UIT_PROMPT> and B<UIT_VERIFY> type strings,
+the UI string for B<UIT_PROMPT> and B<UIT_VERIFY> type strings,
-1 for any other type.
UI_set_result() returns 0 on success or when the UI string is of any
diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index 80c5c9d..71985a4 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -461,7 +461,7 @@ Represents a PKCS#3 DH parameters structure.
=item B<DHparamx>
-Represents a ANSI X9.42 DH parameters structure.
+Represents an ANSI X9.42 DH parameters structure.
=item B<DSA_PUBKEY>
More information about the openssl-commits
mailing list