aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com>2024-02-11 18:14:30 +0100
committerTomas Mraz <tomas@openssl.org>2024-02-14 09:36:11 +0100
commitf7241edda4d9fc76f0ee134e6a07a76c6414b70a (patch)
tree0fb5414485a586bfef5cc2ca66fa8f39834a4d41
parent09693750601e39574ca7ea335faacfb23bc7282b (diff)
downloadopenssl-f7241edda4d9fc76f0ee134e6a07a76c6414b70a.tar.gz
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)
-rw-r--r--crypto/evp/evp_fetch.c2
-rw-r--r--crypto/threads_pthread.c4
-rw-r--r--doc/designs/quic-design/qlog.md2
-rw-r--r--doc/man3/EVP_EncryptInit.pod8
-rw-r--r--include/internal/json_enc.h2
-rw-r--r--include/openssl/hpke.h2
-rw-r--r--test/evp_libctx_test.c4
-rw-r--r--test/recipes/15-test_gensm2.t2
8 files changed, 13 insertions, 13 deletions
diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index 7008f42549..ddc6be40b6 100644
--- 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 ad6c259d92..abcafec2db 100644
--- 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 00474aaa96..c2cb59743d 100644
--- 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 fef8d1aa1f..3f7425f5cb 100644
--- 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 df84c2d008..5767b3e575 100644
--- 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 af637ac61a..cf8b49dd56 100644
--- 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 224e16b398..3d8cd53c43 100644
--- 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 1c4c01a248..62e21ff8d7 100644
--- 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");