summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Schulze <git@andeasschulze.de>2018-03-29 22:10:26 +0200
committerRichard Levitte <levitte@openssl.org>2018-04-19 11:10:17 +0200
commitaa3b328541ff67dde7c40ae73dd11a296647ae3d (patch)
tree9830341042b2bf3b9d2c1e14bcb3742bdea5b8c7
parent7f6dfa19dfbd1d009bf3ab36805b8d132d4ecd56 (diff)
correct spelling errors detected by Debian lintian
CLA: trivial Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5801)
-rw-r--r--CHANGES2
-rw-r--r--apps/req.c2
-rw-r--r--doc/man3/OPENSSL_fork_prepare.pod2
-rw-r--r--doc/man3/SSL_CTX_set_session_ticket_cb.pod2
-rw-r--r--doc/man3/SSL_CTX_use_certificate.pod2
5 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 00b5c4060f..a13183f9e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -65,7 +65,7 @@
below. Similarly TLSv1.2 ciphersuites are not compatible with TLSv1.3.
In order to avoid issues where legacy TLSv1.2 ciphersuite configuration
would otherwise inadvertently disable all TLSv1.3 ciphersuites the
- configuraton has been separated out. See the ciphers man page or the
+ configuration has been separated out. See the ciphers man page or the
SSL_CTX_set_ciphersuites() man page for more information.
[Matt Caswell]
diff --git a/apps/req.c b/apps/req.c
index 4ab636eb7a..ca4b7ec891 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -370,7 +370,7 @@ int req_main(int argc, char **argv)
if (addext_bio) {
if (verbose)
BIO_printf(bio_err,
- "Using additional configuraton from command line\n");
+ "Using additional configuration from command line\n");
addext_conf = app_load_config_bio(addext_bio, NULL);
}
if (template != default_config_file && !app_load_modules(req_conf))
diff --git a/doc/man3/OPENSSL_fork_prepare.pod b/doc/man3/OPENSSL_fork_prepare.pod
index eda83603b1..7c4eb1dbfd 100644
--- a/doc/man3/OPENSSL_fork_prepare.pod
+++ b/doc/man3/OPENSSL_fork_prepare.pod
@@ -30,7 +30,7 @@ such as Linux that have both functions will normally not need to call these
functions as the OpenSSL library will do so automatically.
L<OPENSSL_init_crypto(3)> will register these functions with the appropriate
-hander, when the B<OPENSSL_INIT_ATFORK> flag is used. For other
+handler, when the B<OPENSSL_INIT_ATFORK> flag is used. For other
applications, these functions can be called directly. They should be used
according to the calling sequence described by the pthreads_atfork(3)
documentation, which is summarized here. OPENSSL_fork_prepare() should
diff --git a/doc/man3/SSL_CTX_set_session_ticket_cb.pod b/doc/man3/SSL_CTX_set_session_ticket_cb.pod
index d0df021d51..c7b51dd16b 100644
--- a/doc/man3/SSL_CTX_set_session_ticket_cb.pod
+++ b/doc/man3/SSL_CTX_set_session_ticket_cb.pod
@@ -42,7 +42,7 @@ B<dec_cb> is the application defined callback invoked after session ticket
decryption has been attempted and any session ticket application data is available.
The application can call SSL_SESSION_get_ticket_appdata() at this time to retrieve
the application data. The value of B<arg> is the same as that given to
-SSL_CTX_set_session_ticket_cb(). The B<retv> arguement is the result of the ticket
+SSL_CTX_set_session_ticket_cb(). The B<retv> argument is the result of the ticket
decryption. The B<keyname> and B<keyname_len> identify the key used to decrypt the
session ticket. The B<dec_cb> callback is defined as type
B<SSL_CTX_decrypt_session_ticket_fn>.
diff --git a/doc/man3/SSL_CTX_use_certificate.pod b/doc/man3/SSL_CTX_use_certificate.pod
index c553bf1bee..4dff79cee2 100644
--- a/doc/man3/SSL_CTX_use_certificate.pod
+++ b/doc/man3/SSL_CTX_use_certificate.pod
@@ -106,7 +106,7 @@ B<x>, B<pkey> and B<chain> are set only if all were not previously set.
If B<override> is non-0, then the certificate, private key and chain certs
are always set. If B<pkey> is NULL, then the public key of B<x> is used as
the private key. This is intended to be used with hardware (via the ENGINE
-inteface) that stores the private key securely, such that it cannot be
+interface) that stores the private key securely, such that it cannot be
accessed by OpenSSL. The reference count of the public key is incremented
(twice if there is no private key); it is not copied nor duplicated. This
allows all private key validations checks to succeed without an actual