Fix typos found by codespell

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24949)

diff --git a/crypto/bn/asm/mips.pl b/crypto/bn/asm/mips.pl
index 91b7aac6e790514d1f133c507a2bc669c9f61c3e..98d2943160b52fe92d9ff64b1ef2a6ac244265ff 100644 (file)
--- a/crypto/bn/asm/mips.pl
+++ b/crypto/bn/asm/mips.pl
@@ -802,7 +802,7 @@ $code.=<<___;
 
 #if 0
 /*
- * The bn_div_3_words entry point is re-used for constant-time interface.
+ * The bn_div_3_words entry point is reused for constant-time interface.
  * Implementation is retained as historical reference.
  */
 .align 5

diff --git a/crypto/defaults.c b/crypto/defaults.c
index 27c051508ed8a0fc51b0464237a0e7bbd6ed0653..908539cf31cfeef370ba85d6756ae88a85b15e2a 100644 (file)
--- a/crypto/defaults.c
+++ b/crypto/defaults.c
@@ -112,7 +112,7 @@ static CRYPTO_ONCE defaults_setup_init = CRYPTO_ONCE_STATIC_INIT;
 
 /**
  * @brief Function to setup default values to run once.
- * Only used in Windows environments.  Does run time initalization
+ * Only used in Windows environments.  Does run time initialization
  * of openssldir/modulesdir/enginesdir from the registry
  */
 DEFINE_RUN_ONCE_STATIC(do_defaults_setup)

diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c
index a5d1a04e1dd97b402237903c54fee6541bb638f1..bef44dd4cec7a8263514f9754bab3fd87fc1ca35 100644 (file)
--- a/crypto/x509/x_attrib.c
+++ b/crypto/x509/x_attrib.c
@@ -249,7 +249,7 @@ int ossl_print_attribute_value(BIO *out,
     /* OID-IRI would go here. */
     /* RELATIVE-OID-IRI would go here. */
 
-    /* Would it be approriate to just hexdump? */
+    /* Would it be appropriate to just hexdump? */
     default:
         return BIO_printf(out,
                           "%*s<Unsupported tag %d>",

diff --git a/doc/man3/OPENSSL_malloc.pod b/doc/man3/OPENSSL_malloc.pod
index 6d9251ec3b29b4795f446daa46aff8d847eaf08e..daacea98dedeee90d6b8b46189160ec88e703c4d 100644 (file)
--- a/doc/man3/OPENSSL_malloc.pod
+++ b/doc/man3/OPENSSL_malloc.pod
@@ -211,7 +211,7 @@ CRYPTO_mem_debug_push(), and CRYPTO_mem_debug_pop()
 are deprecated and are no-ops that always return 0.
 
 OPENSSL_strtoul() returns 1 on success and 0 in the event that an error has
-occured. Specifically, 0 is returned in the following events:
+occurred. Specifically, 0 is returned in the following events:
 
 =over 4
 
@@ -231,7 +231,7 @@ If no characters were consumed in the translation
 =back
 
 Note that a success condition does not imply that the expected
-translation has been preformed.  For instance calling
+translation has been performed.  For instance calling
 
     OPENSSL_strtoul("0x12345", &endptr, 10, &num);
 

diff --git a/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod b/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
index 4b4443777ad70c78f045765dd2042ecbe5db914d..80f1d72cf1bdbee396d8f88b82c3a555746b6a47 100644 (file)
--- a/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
+++ b/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
@@ -82,7 +82,7 @@ choice of preferred pass phrase callback form.  These are called indirectly,
 through an internal L<OSSL_PASSPHRASE_CALLBACK(3)> function.
 
 The internal L<OSSL_PASSPHRASE_CALLBACK(3)> function caches the pass phrase, to
-be re-used in all decodings that are performed in the same decoding run (for
+be reused in all decodings that are performed in the same decoding run (for
 example, within one L<OSSL_DECODER_from_bio(3)> call).
 
 =head2 Input Types

diff --git a/doc/man3/SSL_CTX_set_alpn_select_cb.pod b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
index 79e1a252f6bf344d29968213e8adf370db8af71c..cc48275806e2602dc51d0a7dd1ca33e054dc4157 100644 (file)
--- a/doc/man3/SSL_CTX_set_alpn_select_cb.pod
+++ b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
@@ -80,7 +80,7 @@ least one valid (nonempty) protocol entry in the list.
 The SSL_select_next_proto() helper function can be useful from either the ALPN
 callback or the NPN callback (described below). If no match is found, the first
 item in B<client>, B<client_len> is returned in B<out>, B<outlen> and
-B<OPENSSL_NPN_NO_OVERLAP> is returned. This can be useful when implementating
+B<OPENSSL_NPN_NO_OVERLAP> is returned. This can be useful when implementing
 the NPN callback. In the ALPN case, the value returned in B<out> and B<outlen>
 must be ignored if B<OPENSSL_NPN_NO_OVERLAP> has been returned from
 SSL_select_next_proto().

diff --git a/providers/common/include/prov/fipsindicator.h b/providers/common/include/prov/fipsindicator.h
index 9bc068ad512513a9ba20cbb7023a1183014a4e45..f08b63f7b08cac01dd30a8db83adf0581b088d4f 100644 (file)
--- a/providers/common/include/prov/fipsindicator.h
+++ b/providers/common/include/prov/fipsindicator.h
@@ -48,7 +48,7 @@
  * To override strict mode we either need to have a settable variable or have a
  * fips config flag that overrides strict mode.
  * If there are multiple checks, each one could possible have a different
- * configurable item. Each configurable item can be overriden by a different
+ * configurable item. Each configurable item can be overridden by a different
  * settable.
  */
 typedef struct ossl_fips_ind_st {

diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c
index 47e10c673cb793065501bb5126ab33c1735671e3..9c61558b5ad2d3a4fac2e1f6858d01df3efc4c78 100644 (file)
--- a/providers/common/securitycheck.c
+++ b/providers/common/securitycheck.c
@@ -86,7 +86,7 @@ int ossl_ec_check_curve_allowed(const EC_GROUP *group)
     const char *curve_name;
     int nid = EC_GROUP_get_curve_name(group);
 
-    /* Explict curves are not FIPS approved */
+    /* Explicit curves are not FIPS approved */
     if (nid == NID_undef)
         return 0;
     /* Only NIST curves are FIPS approved */

diff --git a/ssl/record/methods/tls13_meth.c b/ssl/record/methods/tls13_meth.c
index dc21bdd5d293af55fc83d966e3dcc07986e232b5..6bbba84d0d8960f5ad15b8a664f4419d6981bd49 100644 (file)
--- a/ssl/record/methods/tls13_meth.c
+++ b/ssl/record/methods/tls13_meth.c
@@ -347,7 +347,7 @@ static int tls13_add_record_padding(OSSL_RECORD_LAYER *rl,
          * We might want to change the "else if" below so that
          * library-added padding can still happen even if there
          * is an application-layer callback. The reason being
-         * the application may not be aware that the effectivness
+         * the application may not be aware that the effectiveness
          * of ECH could be damaged if the callback e.g. only
          * padded application data. However, doing so would be
          * a change that could break some application that has

diff --git a/test/recipes/80-test_cmp_http_data/test_connection.csv b/test/recipes/80-test_cmp_http_data/test_connection.csv
index 83e746518df5d4c5476ad63a538b50dc7dd0f48e..d1a4bb96a8249539082088b5a2b2ee6b4e51a883 100644 (file)
--- a/test/recipes/80-test_cmp_http_data/test_connection.csv
+++ b/test/recipes/80-test_cmp_http_data/test_connection.csv
@@ -12,7 +12,7 @@ disabled as not supported by some host IP configurations,server domain name, -se
 0,server missing argument, -section,, -server,,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 0,server with default port, -section,, -server,_SERVER_HOST,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 0,server port bad syntax: leading garbage, -section,, -server,_SERVER_HOST:x/+80,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
-0,server port bad synatx: trailing garbage, -section,, -server,_SERVER_HOST:_SERVER_PORT+/x.,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
+0,server port bad syntax: trailing garbage, -section,, -server,_SERVER_HOST:_SERVER_PORT+/x.,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 0,server with wrong port, -section,, -server,_SERVER_HOST:999,,,,,BLANK,,,,-msg_timeout,1,BLANK,,BLANK,
 TBD,server IP address with TLS port, -section,, -server,_SERVER_IP:_SERVER_TLS,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 ,,,,,,,,,,,,,,,,,,,

diff --git a/test/strtoultest.c b/test/strtoultest.c
index f766b9d433f59bfb0d31d1a5e827e30ccf82ff23..90ec2b9a3dcda6c6a2d222373c75582ec5018a21 100644 (file)
--- a/test/strtoultest.c
+++ b/test/strtoultest.c
@@ -15,7 +15,7 @@ struct strtoul_test_entry {
     char *input; /* the input string */
     int base; /* the base we are converting in */
     unsigned long expect_val; /* the expected value we should get */
-    int expect_err;  /* the expected error we expect to recieve */
+    int expect_err;  /* the expected error we expect to receive */
     size_t expect_endptr_offset; /* the expected endptr offset, +1 for NULL */
 };
 

diff --git a/util/check-format-commit.sh b/util/check-format-commit.sh
index d1b344f16d33c5fa0401bfbfdc95f32ad9c2d35c..93f5c22bfcbbad216913b0b730ec68679882f5e5 100755 (executable)
--- a/util/check-format-commit.sh
+++ b/util/check-format-commit.sh
@@ -65,7 +65,7 @@ else
     COMMIT_RANGE=$COMMIT_RANGE^..$COMMIT_RANGE
 fi
 
-# Create an iteratable list of files to check formatting on,
+# Create an iterable list of files to check formatting on,
 # including the line ranges that are changed by the commits
 # It produces output of this format:
 # <file name> <change start line>, <change line count>