From: Shane Lontis Date: Thu, 4 Mar 2021 03:54:40 +0000 (+1000) Subject: Reword repeated words. X-Git-Tag: openssl-3.0.0-alpha13~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e6a0d57389d7e5e45b06753692873e40dd125e9;p=thirdparty%2Fopenssl.git Reword repeated words. A trivial PR to remove some commonly repeated words. It looks like this is not the first PR to do this. Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14420) --- diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 67d53b748b5..11c6296bba7 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -32,7 +32,7 @@ ASN1_STRFLGS_ESC_MSB) /* - * Three IO functions for sending data to memory, a BIO and and a FILE + * Three IO functions for sending data to memory, a BIO and a FILE * pointer. */ static int send_bio_chars(void *arg, const void *buf, int len) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 7779ad05fe7..fdefafc1fed 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -432,7 +432,7 @@ void OPENSSL_die(const char *message, const char *file, int line) #if !defined(OPENSSL_CPUID_OBJ) /* - * The volatile is used to to ensure that the compiler generates code that reads + * The volatile is used to ensure that the compiler generates code that reads * all values from the array and doesn't try to optimize this away. The standard * doesn't actually require this behavior if the original data pointed to is * not volatile, but compilers do this in practice anyway. diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c index ab22ecafad1..41fbfaba75c 100644 --- a/crypto/ct/ct_sct.c +++ b/crypto/ct/ct_sct.c @@ -343,7 +343,7 @@ int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx) * XXX: Potential for optimization. This repeats some idempotent heavy * lifting on the certificate for each candidate SCT, and appears to not * use any information in the SCT itself, only the certificate is - * processed. So it may make more sense to to do this just once, perhaps + * processed. So it may make more sense to do this just once, perhaps * associated with the shared (by all SCTs) policy eval ctx. * * XXX: Failure here is global (SCT independent) and represents either an diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c index 966278171c1..32af4eedd36 100644 --- a/crypto/evp/ctrl_params_translate.c +++ b/crypto/evp/ctrl_params_translate.c @@ -202,7 +202,7 @@ struct translation_ctx_st { */ /* - * Copy of the ctrl-style void* argument, if the the fixup_args function + * Copy of the ctrl-style void* argument, if the fixup_args function * needs to manipulate |p2| but wants to remember original. */ void *orig_p2; diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c index e5aa1a03ce0..ac6cd95a74a 100644 --- a/crypto/whrlpool/wp_block.c +++ b/crypto/whrlpool/wp_block.c @@ -165,7 +165,7 @@ typedef u64 u64_aX; */ /* * Note that every Cn macro expands as two loads: one byte load and - * one quadword load. One can argue that that many single-byte loads + * one quadword load. One can argue that many single-byte loads * is too excessive, as one could load a quadword and "milk" it for * eight 8-bit values instead. Well, yes, but in order to do so *and* * avoid excessive loads you have to accommodate a handful of 64-bit diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c index 29d9700ab1c..9dd687f757a 100644 --- a/crypto/x509/by_store.c +++ b/crypto/x509/by_store.c @@ -188,7 +188,7 @@ static int by_store_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, * * To be noted is that X509_OBJECT_set1_* increment the refcount, * but so does X509_STORE_CTX_get_by_subject upon return of this - * function, so we must ensure the the refcount is decremented + * function, so we must ensure the refcount is decremented * before we return, or we will get a refcount leak. We cannot do * this with X509_OBJECT_free(), though, as that will free a bit * too much. diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c index 12cfb627feb..367de35857b 100644 --- a/crypto/x509/pcy_tree.c +++ b/crypto/x509/pcy_tree.c @@ -479,7 +479,7 @@ static int tree_calculate_authority_set(X509_POLICY_TREE *tree, curr = tree->levels; for (i = 1; i < tree->nlevel; i++) { /* - * If no anyPolicy node on this this level it can't appear on lower + * If no anyPolicy node on this level it can't appear on lower * levels so end search. */ if ((anyptr = curr->anyPolicy) == NULL) diff --git a/doc/man7/provider-kem.pod b/doc/man7/provider-kem.pod index d4467dbd791..4a094bd2c9b 100644 --- a/doc/man7/provider-kem.pod +++ b/doc/man7/provider-kem.pod @@ -128,7 +128,7 @@ OSSL_FUNC_kem_encapsulate() performs the actual encapsulation itself. A previously initialised asymmetric kem context is passed in the I parameter. Unless I is NULL, the data to be encapsulated is internally generated, -and returned into the the buffer pointed to by the I parameter and the +and returned into the buffer pointed to by the I parameter and the encapsulated data should also be written to the location pointed to by the I parameter. The length of the encapsulated data should be written to I<*outlen> and the length of the generated secret should be written to diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 1fded640a17..348b5076224 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1595,7 +1595,7 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s) int SSL_copy_session_id(SSL *t, const SSL *f) { int i; - /* Do we need to to SSL locking? */ + /* Do we need to do SSL locking? */ if (!SSL_set_session(t, SSL_get_session(f))) { return 0; } diff --git a/test/evp_test.c b/test/evp_test.c index 8c88f0937c4..d781ecadce3 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -3594,7 +3594,7 @@ int setup_tests(void) /* * Load the provider via configuration into the created library context. * Load the 'null' provider into the default library context to ensure that - * the the tests do not fallback to using the default provider. + * the tests do not fallback to using the default provider. */ if (!test_get_libctx(&libctx, &prov_null, config_file, NULL, NULL)) return 0; diff --git a/util/perl/OpenSSL/Ordinals.pm b/util/perl/OpenSSL/Ordinals.pm index 66bf30dd501..7e4c008dc28 100644 --- a/util/perl/OpenSSL/Ordinals.pm +++ b/util/perl/OpenSSL/Ordinals.pm @@ -863,7 +863,7 @@ handled by the caller. The caller may change this to an actual number. =item B<< $item->version >> (read-only) The version number for this item. Please note that these version numbers -have underscore (C<_>) as a separator the the version parts. +have underscore (C<_>) as a separator for the version parts. =item B<< $item->exists >> (read-only)