diff options
author | Veres Lajos <vlajos@gmail.com> | 2019-11-30 23:18:47 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-12-11 19:04:01 +0100 |
commit | 79c44b4e3044aee9dc9618850d4f1ce067757b4b (patch) | |
tree | e591ce5fb459b9c68e91dada248eb09c20b1084a | |
parent | 2ff16afc17af7ee8dbff1fb34b71a51ecd55811e (diff) |
Fix some typos
Reported-by: misspell-fixer <https://github.com/vlajos/misspell-fixer>
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/10544)
54 files changed, 71 insertions, 71 deletions
diff --git a/.travis.yml b/.travis.yml index 6d0fa801e8..b7f2e3da2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -178,7 +178,7 @@ script: travis_terminate 1; fi - if ! git diff --exit-code; then - echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITED'; + echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITTED'; travis_terminate 1; fi - if test -n "$GENERATE" && ! $make build_all_generated; then diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index b552e67df2..6306a2315a 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -276,7 +276,7 @@ my %targets = ( # primarily because vendor assembler can't assemble our modules # with -KPIC flag. As result it, assembly support, was not even # available as option. But its lack means lack of side-channel - # resistant code, which is incompatible with security by todays + # resistant code, which is incompatible with security by today's # standards. Fortunately gcc is readily available prepackaged # option, which we can firmly point at... # @@ -1776,7 +1776,7 @@ my %targets = ( debug => "/DEBUG/TRACEBACK", release => "/NODEBUG/NOTRACEBACK"), # Because of dso_cflags below, we can't set the generic |cflags| here, - # as it can't be overriden, so we set separate C flags for libraries + # as it can't be overridden, so we set separate C flags for libraries # and binaries instead. bin_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"), lib_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"), @@ -1129,7 +1129,7 @@ HASHBANGPERL The command string for the Perl executable to insert in the - #! line of perl scripts that will be publically installed. + #! line of perl scripts that will be publicly installed. Default: /usr/bin/env perl Note: the value of this variable is added to the same scripts on all platforms, but it's only relevant on Unix-like platforms. diff --git a/apps/lib/build.info b/apps/lib/build.info index 0c24d76d3c..7a2536af24 100644 --- a/apps/lib/build.info +++ b/apps/lib/build.info @@ -1,4 +1,4 @@ -# Auxilliary program source +# Auxiliary program source IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}] # It's called 'init', but doesn't have much 'init' in it... $AUXLIBAPPSSRC=win32_init.c diff --git a/apps/passwd.c b/apps/passwd.c index 3b1d2ce3ca..c17bfd839c 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -820,7 +820,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, (*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */ (*salt_p)[i] = 0; # ifdef CHARSET_EBCDIC - /* The password encryption funtion will convert back to ASCII */ + /* The password encryption function will convert back to ASCII */ ascii2ebcdic(*salt_p, *salt_p, saltlen); # endif } diff --git a/crypto/aes/asm/aesni-x86_64.pl b/crypto/aes/asm/aesni-x86_64.pl index 486ebc8d95..e951ce7809 100644 --- a/crypto/aes/asm/aesni-x86_64.pl +++ b/crypto/aes/asm/aesni-x86_64.pl @@ -59,7 +59,7 @@ # nothing one can do and the result appears optimal. CCM result is # identical to CBC, because CBC-MAC is essentially CBC encrypt without # saving output. CCM CTR "stays invisible," because it's neatly -# interleaved wih CBC-MAC. This provides ~30% improvement over +# interleaved with CBC-MAC. This provides ~30% improvement over # "straightforward" CCM implementation with CTR and CBC-MAC performed # disjointly. Parallelizable modes practically achieve the theoretical # limit. diff --git a/crypto/aes/asm/bsaes-x86_64.pl b/crypto/aes/asm/bsaes-x86_64.pl index 6593f7a22e..1f9f261ca4 100644 --- a/crypto/aes/asm/bsaes-x86_64.pl +++ b/crypto/aes/asm/bsaes-x86_64.pl @@ -27,7 +27,7 @@ # - code was made position-independent; # - rounds were folded into a loop resulting in >5x size reduction # from 12.5KB to 2.2KB; -# - above was possibile thanks to mixcolumns() modification that +# - above was possible thanks to mixcolumns() modification that # allowed to feed its output back to aesenc[last], this was # achieved at cost of two additional inter-registers moves; # - some instruction reordering and interleaving; diff --git a/crypto/asn1_dsa.c b/crypto/asn1_dsa.c index 972a9eb905..34835a5214 100644 --- a/crypto/asn1_dsa.c +++ b/crypto/asn1_dsa.c @@ -99,7 +99,7 @@ int encode_der_integer(WPACKET *pkt, const BIGNUM *n) /* * Outputs the DER encoding of a DSA-Sig-Value or ECDSA-Sig-Value to pkt. pkt * may be initialised with a NULL buffer which enables pkt to be used to - * calulate how many bytes would be needed. + * calculate how many bytes would be needed. * * Returns 1 on success or 0 on error. */ diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4 index c6661fe72d..c00ac6184d 100644 --- a/crypto/des/asm/des_enc.m4 +++ b/crypto/des/asm/des_enc.m4 @@ -104,15 +104,15 @@ changequote({,}) ! technique. ! ! The macro also loads address sbox 1 to 5 to global 1 to 5, address -! sbox 6 to local6, and addres sbox 8 to out3. +! sbox 6 to local6, and address sbox 8 to out3. ! -! Rotates the halfs 3 left to bring the sbox bits in convenient positions. +! Rotates the halves 3 left to bring the sbox bits in convenient positions. ! ! Loads key first round from address in parameter 5 to out0, out1. ! ! After the original LibDES initial permutation, the resulting left ! is in the variable initially used for right and vice versa. The macro -! implements the possibility to keep the halfs in the original registers. +! implements the possibility to keep the halves in the original registers. ! ! parameter 1 left ! parameter 2 right @@ -1182,7 +1182,7 @@ DES_encrypt2: add %o7,global1,global1 sub global1,.PIC.DES_SPtrans-.des_and,out2 - ! Set sbox address 1 to 6 and rotate halfs 3 left + ! Set sbox address 1 to 6 and rotate halves 3 left ! Errors caught by destest? Yes. Still? *NO* !sethi %hi(DES_SPtrans), global1 ! address sbox 1 diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 4baed5c48e..7a80a7e145 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2675,7 +2675,7 @@ PROP_R_NOT_AN_HEXADECIMAL_DIGIT:102:not an hexadecimal digit PROP_R_NOT_AN_IDENTIFIER:103:not an identifier PROP_R_NOT_AN_OCTAL_DIGIT:104:not an octal digit PROP_R_NOT_A_DECIMAL_DIGIT:105:not a decimal digit -PROP_R_NO_MATCHING_STRING_DELIMETER:106:no matching string delimeter +PROP_R_NO_MATCHING_STRING_DELIMITER:106:no matching string delimiter PROP_R_NO_VALUE:107:no value PROP_R_PARSE_FAILED:108:parse failed PROP_R_STRING_TOO_LONG:109:string too long diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 1609d2bf53..92dca9854b 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -165,7 +165,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) if (type->prov == NULL) { #ifdef FIPS_MODE - /* We only do explict fetches inside the FIPS module */ + /* We only do explicit fetches inside the FIPS module */ EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_INITIALIZATION_ERROR); return 0; #else diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 42c2e5eb7b..296e8db1ca 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -915,7 +915,7 @@ typedef struct { } icv; unsigned char k[32]; } kmac_param; - /* KMAC-AES paramater block - end */ + /* KMAC-AES parameter block - end */ union { unsigned long long g[2]; @@ -3228,7 +3228,7 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, return 0; /* - * Impose a limit of 2^20 blocks per data unit as specifed by + * Impose a limit of 2^20 blocks per data unit as specified by * IEEE Std 1619-2018. The earlier and obsolete IEEE Std 1619-2007 * indicated that this was a SHOULD NOT rather than a MUST NOT. * NIST SP 800-38E mandates the same limit. diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 96eb350623..3896cff34d 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -317,7 +317,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, if (cipher->prov == NULL) { #ifdef FIPS_MODE - /* We only do explict fetches inside the FIPS module */ + /* We only do explicit fetches inside the FIPS module */ EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_INITIALIZATION_ERROR); return 0; #else diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index f872377671..a5f7dbaf53 100644 --- a/crypto/evp/pmeth_gn.c +++ b/crypto/evp/pmeth_gn.c @@ -78,7 +78,7 @@ int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, OSSL_PARAM params[]) } /* - * TODO(3.0) Re-evalutate the names, it's possible that we find these to be + * TODO(3.0) Re-evaluate the names, it's possible that we find these to be * better: * * EVP_PKEY_param_settable() diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c index 477dedfd00..5f81930190 100644 --- a/crypto/property/property_err.c +++ b/crypto/property/property_err.c @@ -24,8 +24,8 @@ static const ERR_STRING_DATA PROP_str_reasons[] = { "not an octal digit"}, {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT), "not a decimal digit"}, - {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMETER), - "no matching string delimeter"}, + {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMITER), + "no matching string delimiter"}, {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value"}, {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed"}, {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long"}, diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index f6377e7714..6476f65bc7 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -203,7 +203,7 @@ static int parse_string(OPENSSL_CTX *ctx, const char *t[], char delim, s++; } if (*s == '\0') { - ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_MATCHING_STRING_DELIMETER, + ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_MATCHING_STRING_DELIMITER, "HERE-->%c%s", delim, *t); return 0; } @@ -492,7 +492,7 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, /* * Handle the cases of a missing value and a query with no corresponding - * definition. The former fails for any comparision except inequality, + * definition. The former fails for any comparison except inequality, * the latter is treated as a comparison against the Boolean false. */ if (q[i].type == PROPERTY_TYPE_VALUE_UNDEFINED) { diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c index 98e670f92c..13d913bc28 100644 --- a/crypto/rand/rand_vms.c +++ b/crypto/rand/rand_vms.c @@ -488,7 +488,7 @@ int rand_pool_add_nonce_data(RAND_POOL *pool) /* * Add process id, thread id, and a high resolution timestamp * (where available, which is OpenVMS v8.4 and up) to ensure that - * the nonce is unique whith high probability for different process + * the nonce is unique with high probability for different process * instances. */ data.pid = getpid(); diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 40b0de9209..213a742529 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -133,7 +133,7 @@ int rand_pool_add_nonce_data(RAND_POOL *pool) /* * Add process id, thread id, and a high resolution timestamp to - * ensure that the nonce is unique whith high probability for + * ensure that the nonce is unique with high probability for * different process instances. */ data.pid = GetCurrentProcessId(); diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c index c4c0b6a95b..a580b1dc59 100644 --- a/crypto/rsa/rsa_sp800_56b_check.c +++ b/crypto/rsa/rsa_sp800_56b_check.c @@ -101,7 +101,7 @@ int rsa_check_prime_factor_range(const BIGNUM *p, int nbits, BN_CTX *ctx) if (shift >= 0) { /* * We don't have all the bits. bn_inv_sqrt_2 contains a rounded up - * value, so there is a very low probabilty that we'll reject a valid + * value, so there is a very low probability that we'll reject a valid * value. */ if (!BN_lshift(low, low, shift)) diff --git a/crypto/serializer/serializer_meth.c b/crypto/serializer/serializer_meth.c index 145d58921f..a098ffb07b 100644 --- a/crypto/serializer/serializer_meth.c +++ b/crypto/serializer/serializer_meth.c @@ -450,7 +450,7 @@ const OSSL_PARAM *OSSL_SERIALIZER_settable_ctx_params(OSSL_SERIALIZER *ser) /* * |ser| value NULL is valid, and signifies that there is no serializer. * This is useful to provide fallback mechanisms. - * Funtions that want to verify if there is a serializer can do so with + * Functions that want to verify if there is a serializer can do so with * OSSL_SERIALIZER_CTX_get_serializer() */ OSSL_SERIALIZER_CTX *OSSL_SERIALIZER_CTX_new(OSSL_SERIALIZER *ser) diff --git a/doc/internal/man3/ossl_init_thread_deregister.pod b/doc/internal/man3/ossl_init_thread_deregister.pod index 923b525477..6c9e0b5b89 100644 --- a/doc/internal/man3/ossl_init_thread_deregister.pod +++ b/doc/internal/man3/ossl_init_thread_deregister.pod @@ -32,7 +32,7 @@ thread local variable and then register a stop handler. When the thread is stopping the stop handler is called (while on that thread) and the code can clean up the value stored in the thread local variable. -A new stop handler is registerd using the function ossl_init_thread_start(). +A new stop handler is registered using the function ossl_init_thread_start(). The I<index> parameter should be a unique value that can be used to identify a set of common stop handlers and is passed in a later call to ossl_init_thread_deregister. If no later call to ossl_init_thread_deregister is diff --git a/doc/internal/man3/ossl_provider_new.pod b/doc/internal/man3/ossl_provider_new.pod index 39c3cba027..36fe6301bf 100644 --- a/doc/internal/man3/ossl_provider_new.pod +++ b/doc/internal/man3/ossl_provider_new.pod @@ -261,7 +261,7 @@ ossl_provider_library_context() return a pointer to the library context. This may be NULL, and is perfectly valid, as it denotes the default global library context. -ossl_provider_teardown() doesnt't return any value. +ossl_provider_teardown() doesn't return any value. ossl_provider_gettable_params() returns a pointer to a constant I<OSSL_PARAM> array if this function is available in the provider, diff --git a/doc/internal/man7/build.info.pod b/doc/internal/man7/build.info.pod index 742f78ce39..2be709f770 100644 --- a/doc/internal/man7/build.info.pod +++ b/doc/internal/man7/build.info.pod @@ -73,7 +73,7 @@ generators, and are used to specify exactly what end product files (programs, libraries, modules or scripts) are to be produced, and from what sources. -Intermediate files, such as object files, are seldom refered to at +Intermediate files, such as object files, are seldom referred to at all. They sometimes can be, if there's a need, but this should happen very rarely, and support for that sort of thing is added on as-needed basis. @@ -534,7 +534,7 @@ dependency is maintained: DEPEND[libfoo.a]{weak}=libfoo.a libcookie.a -This is useful in complex dependecy trees where two libraries can be +This is useful in complex dependency trees where two libraries can be used as alternatives for each other. In this example, C<lib1.a> and C<lib2.a> have alternative implementations of the same thing, and C<libmandatory.a> has unresolved references to that same thing, and is diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod index 4ff5784124..21e9d97217 100644 --- a/doc/man1/openssl.pod +++ b/doc/man1/openssl.pod @@ -778,7 +778,7 @@ client. =item B<-xcertform> B<DER>|B<PEM>, B<-xkeyform> B<DER>|B<PEM> -The input format for the extra certifcate and key, respectively. +The input format for the extra certificate and key, respectively. See L<openssl(1)/Format Options> for details. =back diff --git a/doc/man3/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod index 2d7187b3b3..62eef297d8 100644 --- a/doc/man3/ASYNC_WAIT_CTX_new.pod +++ b/doc/man3/ASYNC_WAIT_CTX_new.pod @@ -187,7 +187,7 @@ ASYNC_WAIT_CTX_set_wait_fd, ASYNC_WAIT_CTX_get_fd, ASYNC_WAIT_CTX_get_all_fds, ASYNC_WAIT_CTX_get_changed_fds, ASYNC_WAIT_CTX_clear_fd, ASYNC_WAIT_CTX_set_callback, ASYNC_WAIT_CTX_get_callback and ASYNC_WAIT_CTX_set_status all return 1 on success or 0 on error. -ASYNC_WAIT_CTX_get_status() returs the engine status. +ASYNC_WAIT_CTX_get_status() returns the engine status. =head1 NOTES diff --git a/doc/man3/ERR_new.pod b/doc/man3/ERR_new.pod index 00ea93754d..e1c71bebaa 100644 --- a/doc/man3/ERR_new.pod +++ b/doc/man3/ERR_new.pod @@ -27,7 +27,7 @@ ERR_set_debug() sets the debug information related to the current error in the thread's error queue. The values that can be given are the filename I<file>, line in the file I<line> and the name of the function I<func> where the error -occured. +occurred. The names must be constant, this function will only save away the pointers, not copy the strings. diff --git a/doc/man3/ERR_put_error.pod b/doc/man3/ERR_put_error.pod index 437dd42335..e3c19bfdf4 100644 --- a/doc/man3/ERR_put_error.pod +++ b/doc/man3/ERR_put_error.pod @@ -23,9 +23,9 @@ Deprecated since OpenSSL 3.0: =head1 DESCRIPTION ERR_raise() adds a new error to the thread's error queue. The -error occured in the library B<lib> for the reason given by the +error occurred in the library B<lib> for the reason given by the B<reason> code. Furthermore, the name of the file, the line, and name -of the function where the error occured is saved with the error +of the function where the error occurred is saved with the error record. ERR_raise_data() does the same thing as ERR_raise(), but also lets the diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod index 50a6cc8702..a008d0f6f6 100644 --- a/doc/man3/EVP_EncryptInit.pod +++ b/doc/man3/EVP_EncryptInit.pod @@ -299,7 +299,7 @@ B<params> from CIPHER context B<ctx>. EVP_CIPHER_gettable_params(), EVP_CIPHER_gettable_ctx_params(), and EVP_CIPHER_settable_ctx_params() get a constant B<OSSL_PARAM> array -that decribes the retrievable and settable parameters, i.e. parameters +that describes the retrievable and settable parameters, i.e. parameters that can be used with EVP_CIPHER_get_params(), EVP_CIPHER_CTX_get_params() and EVP_CIPHER_CTX_set_params(), respectively. See L<OSSL_PARAM(3)> for the use of B<OSSL_PARAM> as parameter descriptor. diff --git a/doc/man3/EVP_KDF.pod b/doc/man3/EVP_KDF.pod index 9bb360d8b8..2d7fe49c16 100644 --- a/doc/man3/EVP_KDF.pod +++ b/doc/man3/EVP_KDF.pod @@ -122,7 +122,7 @@ defined by the implementation. EVP_KDF_gettable_params(), EVP_KDF_gettable_ctx_params() and |