Fix new typos found by codespell

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23545)

diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index 7008f425490193421e9abfdaa53924fe7468db11..ddc6be40b6e7ce7ee3600c543e115240f860f0a7 100644 (file)
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -323,7 +323,7 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
              * will create a method against all names, but the lookup will fail
              * as ossl_namemap_name2num treats the name string as a single name
              * rather than introducing new features where in the EVP_<obj>_fetch
-             * parses the string and querys for each, return an error.
+             * parses the string and queries for each, return an error.
              */
             if (name_id == 0)
                 name_id = ossl_namemap_name2num(namemap, name);

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index ad6c259d92a4fea4c9f11701db0e04dce307e52d..abcafec2db4a34214b75138c12910213db181d85 100644 (file)
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -400,7 +400,7 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock)
     }
     /*
      * if we get here, we're trying to unlock a lock that we never acquired
-     * thats fatal
+     * that's fatal
      */
     assert(0);
 }
@@ -453,7 +453,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock)
     /*
      * update the reader index to be the prior qp
      * Note the use of __ATOMIC_RELEASE here is based on the corresponding use
-     * of __ATOMIC_ACQUIRE in get_hold_current_qp, as we wan't any publication
+     * of __ATOMIC_ACQUIRE in get_hold_current_qp, as we want any publication
      * of this value to be seen on the read side immediately after it happens
      */
     ATOMIC_STORE_N(&lock->reader_idx, lock->current_alloc_idx,

diff --git a/doc/designs/quic-design/qlog.md b/doc/designs/quic-design/qlog.md
index 00474aaa9603106cf54309e2f60665c76e49c1a5..c2cb59743d5772fac968d0baa1c450c4651fbc5d 100644 (file)
--- a/doc/designs/quic-design/qlog.md
+++ b/doc/designs/quic-design/qlog.md
@@ -120,7 +120,7 @@ The syntax works as follows:
 Each term is applied in sequence, therefore later items in the filter override
 earlier items. In the example above, for example, all event types are enabled,
 then the `quic:version_information` event is disabled, then all event types are
-disabled, then the `quic:packet_sent` event is reenabled.
+disabled, then the `quic:packet_sent` event is re-enabled.
 
 Some examples of more normal filters include:
 

diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index fef8d1aa1f3d538e19f46f2d437ad7ea9bc42d18..3f7425f5cb5572e33c2d17e9af8f030bebfc3db6 100644 (file)
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -489,7 +489,7 @@ EVP_CIPHER_free().
 Return the NID of a cipher when passed an B<EVP_CIPHER> or B<EVP_CIPHER_CTX>
 structure.  The actual NID value is an internal value which may not have a
 corresponding OBJECT IDENTIFIER.  NID_undef is returned in the event that the
-nid is unknown or if the cipher has not been properly initalized via a call to
+nid is unknown or if the cipher has not been properly initialized via a call to
 B<EVP_CipherInit>.
 
 =item EVP_CIPHER_CTX_set_flags(), EVP_CIPHER_CTX_clear_flags() and EVP_CIPHER_CTX_test_flags()
@@ -528,7 +528,7 @@ length to any value other than the fixed value is an error.
 
 Return the IV length of a cipher when passed an B<EVP_CIPHER> or
 B<EVP_CIPHER_CTX>. It will return zero if the cipher does not use an IV, if
-the cipher has not yet been initalized within the B<EVP_CIPHER_CTX>, or if the
+the cipher has not yet been initialized within the B<EVP_CIPHER_CTX>, or if the
 passed cipher is NULL.  The constant B<EVP_MAX_IV_LENGTH> is the maximum IV
 length for all ciphers.
 
@@ -543,7 +543,7 @@ the tag length has not been set.
 Return the block size of a cipher when passed an B<EVP_CIPHER> or
 B<EVP_CIPHER_CTX> structure. The constant B<EVP_MAX_BLOCK_LENGTH> is also the
 maximum block length for all ciphers. A value of 0 is returned if the cipher
-has not been properly initalized with a call to B<EVP_CipherInit>.
+has not been properly initialized with a call to B<EVP_CipherInit>.
 
 =item EVP_CIPHER_get_type() and EVP_CIPHER_CTX_get_type()
 
@@ -1256,7 +1256,7 @@ EVP_CipherFinal_ex() returns 0 for a decryption failure or 1 for success.
 
 EVP_Cipher() returns 1 on success and <= 0 on failure, if the flag
 B<EVP_CIPH_FLAG_CUSTOM_CIPHER> is not set for the cipher, or if the cipher has
-not been initalized via a call to B<EVP_CipherInit_ex2>.
+not been initialized via a call to B<EVP_CipherInit_ex2>.
 EVP_Cipher() returns the number of bytes written to I<out> for encryption / decryption, or
 the number of bytes authenticated in a call specifying AAD for an AEAD cipher, if the flag
 B<EVP_CIPH_FLAG_CUSTOM_CIPHER> is set for the cipher.

diff --git a/include/internal/json_enc.h b/include/internal/json_enc.h
index df84c2d0086d1857211fbf366daaf5e251225d82..5767b3e575c9ae5b600ccc9ae749253ee2531ce6 100644 (file)
--- a/include/internal/json_enc.h
+++ b/include/internal/json_enc.h
@@ -175,7 +175,7 @@ int ossl_json_in_error(OSSL_JSON_ENC *json);
 /* Begin a new JSON object. */
 void ossl_json_object_begin(OSSL_JSON_ENC *json);
 
-/* End a JSON obejct. Must be matched with a call to ossl_json_object_begin(). */
+/* End a JSON object. Must be matched with a call to ossl_json_object_begin(). */
 void ossl_json_object_end(OSSL_JSON_ENC *json);
 
 /* Begin a new JSON array. */

diff --git a/include/openssl/hpke.h b/include/openssl/hpke.h
index af637ac61abe48ceef198f9fe9930454d6ffc2ca..cf8b49dd568b4958798390cd36e522a9d00a3b89 100644 (file)
--- a/include/openssl/hpke.h
+++ b/include/openssl/hpke.h
@@ -68,7 +68,7 @@
 
 /*
  * Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
  */
 # define OSSL_HPKE_ROLE_SENDER 0
 # define OSSL_HPKE_ROLE_RECEIVER 1

diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c
index 224e16b398af9f3d715eeca8d1c71fdf4ff2ef31..3d8cd53c436d83b80e925669c14a97cd15fd0342 100644 (file)
--- a/test/evp_libctx_test.c
+++ b/test/evp_libctx_test.c
@@ -83,14 +83,14 @@ static int test_evp_cipher_api_safety(void)
 
     /*
      * Ensure that EVP_CIPHER_get_block_size returns 0
-     * if we haven't initalized the cipher in this context
+     * if we haven't initialized the cipher in this context
      */
     if (!TEST_int_eq(EVP_CIPHER_CTX_get_block_size(ctx), 0))
         goto err_free;
 
     /*
      * Ensure that EVP_CIPHER_get_iv_length returns 0
-     * if we haven't initalized the cipher in this context
+     * if we haven't initialized the cipher in this context
      */
     if (!TEST_int_eq(EVP_CIPHER_CTX_get_iv_length(ctx), 0))
         goto err_free;

diff --git a/test/recipes/15-test_gensm2.t b/test/recipes/15-test_gensm2.t
index 1c4c01a248894bfe10d6d1eeb6b47dd408b5da53..62e21ff8d750851b914abe590de0762e63f70acb 100644 (file)
--- a/test/recipes/15-test_gensm2.t
+++ b/test/recipes/15-test_gensm2.t
@@ -16,7 +16,7 @@ use OpenSSL::Test::Utils;
 
 # These are special key generation tests for SM2 keys specifically,
 # as they could be said to be a bit special in their encoding.
-# This is an auxilliary test to 15-test_genec.t
+# This is an auxiliary test to 15-test_genec.t
 
 setup("test_gensm2");