Skip to content

Commit

Permalink
Fix Typos
Browse files Browse the repository at this point in the history
CLA: trivial

Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from openssl#9288)
  • Loading branch information
Coeur authored and mspncp committed Jul 2, 2019
1 parent f663ddc commit c2969ff
Show file tree
Hide file tree
Showing 69 changed files with 89 additions and 89 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
EVP_KDF_CTRL_SET_PBKDF2_PKCS5_MODE.
[Shane Lontis]

*) Default cipher lists/suites are now avaialble via a function, the
*) Default cipher lists/suites are now available via a function, the
#defines are deprecated.
[Todd Short]

Expand Down Expand Up @@ -462,7 +462,7 @@
SSL_set_ciphersuites()
[Matt Caswell]

*) Memory allocation failures consistenly add an error to the error
*) Memory allocation failures consistently add an error to the error
stack.
[Rich Salz]

Expand Down
2 changes: 1 addition & 1 deletion Configurations/15-ios.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#### iPhoneOS/iOS
#
# It takes recent enough XCode to use following two targets. It shouldn't
# It takes recent enough Xcode to use following two targets. It shouldn't
# be a problem by now, but if they don't work, original targets below
# that depend on manual definition of environment variables should still
# work...
Expand Down
2 changes: 1 addition & 1 deletion Configurations/50-win-onecore.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Windows OneCore targets.
#
# OneCore is new API stability "contract" that transends Desktop, IoT and
# OneCore is new API stability "contract" that transcends Desktop, IoT and
# Mobile[?] Windows editions. It's a set up "umbrella" libraries that
# export subset of Win32 API that are common to all Windows 10 devices.
#
Expand Down
2 changes: 1 addition & 1 deletion Configurations/common0.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
our @generated =
sort ( ( grep { defined $unified_info{generate}->{$_} }
sort keys %generatables ),
# Scripts are assumed to be generated, so add thhem too
# Scripts are assumed to be generated, so add them too
( grep { defined $unified_info{sources}->{$_} }
@{$unified_info{scripts}} ) );

Expand Down
2 changes: 1 addition & 1 deletion apps/pkcs12.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ static int alg_print(const X509_ALGOR *alg)
goto done;
}
BIO_printf(bio_err, ", Salt length: %d, Cost(N): %ld, "
"Block size(r): %ld, Paralelizm(p): %ld",
"Block size(r): %ld, Parallelism(p): %ld",
ASN1_STRING_length(kdf->salt),
ASN1_INTEGER_get(kdf->costParameter),
ASN1_INTEGER_get(kdf->blockSize),
Expand Down
2 changes: 1 addition & 1 deletion apps/speed.c
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ int speed_main(int argc, char **argv)
}

buflen = lengths[size_num - 1];
if (buflen < 36) /* size of random vector in RSA bencmark */
if (buflen < 36) /* size of random vector in RSA benchmark */
buflen = 36;
buflen += MAX_MISALIGNMENT + 1;
loopargs[i].buf_malloc = app_malloc(buflen, "input buffer");
Expand Down
2 changes: 1 addition & 1 deletion apps/storeutl.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ int storeutl_main(int argc, char *argv[])
}
/*
* If expected wasn't set at this point, it means the map
* isn't syncronised with the possible options leading here.
* isn't synchronised with the possible options leading here.
*/
OPENSSL_assert(expected != 0);
}
Expand Down
2 changes: 1 addition & 1 deletion crypto/README.sparse_array
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The tree height is dynamically increased as needed based on additions.
An empty tree is represented by a NULL root pointer. Inserting a value at
index 0 results in the allocation of a top level node full of null pointers
except for the single pointer to the user's data (N = SA_BLOCK_MAX for
breviety):
brevity):

+----+
|Root|
Expand Down
4 changes: 2 additions & 2 deletions crypto/aes/asm/aes-s390x.pl
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
# Implement AES_set_[en|de]crypt_key. Key schedule setup is avoided
# for 128-bit keys, if hardware support is detected.

# Januray 2009.
# January 2009.
#
# Add support for hardware AES192/256 and reschedule instructions to
# minimize/avoid Address Generation Interlock hazard and to favour
# dual-issue z10 pipeline. This gave ~25% improvement on z10 and
# almost 50% on z9. The gain is smaller on z10, because being dual-
# issue z10 makes it impossible to eliminate the interlock condition:
# critial path is not long enough. Yet it spends ~24 cycles per byte
# critical path is not long enough. Yet it spends ~24 cycles per byte
# processed with 128-bit key.
#
# Unlike previous version hardware support detection takes place only
Expand Down
2 changes: 1 addition & 1 deletion crypto/asn1/a_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void determine_days(struct tm *tm)
}
c = y / 100;
y %= 100;
/* Zeller's congruance */
/* Zeller's congruence */
tm->tm_wday = (d + (13 * m) / 5 + y + y / 4 + c / 4 + 5 * c + 6) % 7;
}

Expand Down
2 changes: 1 addition & 1 deletion crypto/bio/bss_dgram.c
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
* reasons. When BIO_CTRL_DGRAM_SET_PEEK_MODE was first defined its value
* was incorrectly clashing with BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE. The
* value has been updated to a non-clashing value. However to preserve
* binary compatiblity we now respond to both the old value and the new one
* binary compatibility we now respond to both the old value and the new one
*/
case BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE:
case BIO_CTRL_DGRAM_SET_PEEK_MODE:
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/asm/mips.pl
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@
#if 0
/*
* The bn_div_3_words entry point is re-used for constant-time interface.
* Implementation is retained as hystorical reference.
* Implementation is retained as historical reference.
*/
.align 5
.globl bn_div_3_words
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/bn_div.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
*
* - availability of constant-time bn_div_3_words;
* - dividend is at least as "wide" as divisor, limb-wise, zero-padded
* if so requied, which shouldn't be a privacy problem, because
* if so required, which shouldn't be a privacy problem, because
* divisor's length is considered public;
*/
int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/bn_lcl.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ struct bn_gencb_st {
(b) > 23 ? 3 : 1)

/*
* BN_mod_exp_mont_conttime is based on the assumption that the L1 data cache
* BN_mod_exp_mont_consttime is based on the assumption that the L1 data cache
* line width of the target processor is at least the following value.
*/
# define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH ( 64 )
Expand Down
2 changes: 1 addition & 1 deletion crypto/dsa/dsa_ossl.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
* one bit longer than the modulus.
*
* There are some concerns about the efficacy of doing this. More
* specificly refer to the discussion starting with:
* specifically refer to the discussion starting with:
* https://github.com/openssl/openssl/pull/7486#discussion_r228323705
* The fix is to rework BN so these gymnastics aren't required.
*/
Expand Down
2 changes: 1 addition & 1 deletion crypto/ec/asm/ecp_nistz256-x86_64.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@
################################# reduction
mulx 8*0+128(%r14), $t0, $t1
adcx $t0, $acc3 # guranteed to be zero
adcx $t0, $acc3 # guaranteed to be zero
adox $t1, $acc4
mulx 8*1+128(%r14), $t0, $t1
Expand Down
4 changes: 2 additions & 2 deletions crypto/ec/asm/x25519-ppc64.pl
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
and $t0,$t0,$t1
sldi $a3,$a3,1
add $t0,$t0,$t1 # compare to modulus in the same go
srdi $a3,$a3,1 # most signifcant bit cleared
srdi $a3,$a3,1 # most significant bit cleared
addc $a0,$a0,$t0
addze $a1,$a1
Expand All @@ -462,7 +462,7 @@
sradi $t0,$a3,63 # most significant bit -> mask
sldi $a3,$a3,1
andc $t0,$t1,$t0
srdi $a3,$a3,1 # most signifcant bit cleared
srdi $a3,$a3,1 # most significant bit cleared
subi $rp,$rp,1
subfc $a0,$t0,$a0
Expand Down
2 changes: 1 addition & 1 deletion crypto/ec/ec_lcl.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ struct ec_method_st {
int (*field_div) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
const BIGNUM *b, BN_CTX *);
/*-
* 'field_inv' computes the multipicative inverse of a in the field,
* 'field_inv' computes the multiplicative inverse of a in the field,
* storing the result in r.
*
* If 'a' is zero (or equivalent), you'll get an EC_R_CANNOT_INVERT error.
Expand Down
2 changes: 1 addition & 1 deletion crypto/ec/ecp_nistp521.c
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ static void point_add(felem x3, felem y3, felem z3,
* ffffffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb
* 71e913863f7, in that case the penultimate intermediate is -9G and
* the final digit is also -9G. Since this only happens for a single
* scalar, the timing leak is irrelevent. (Any attacker who wanted to
* scalar, the timing leak is irrelevant. (Any attacker who wanted to
* check whether a secret scalar was that exact value, can already do
* so.)
*/
Expand Down
2 changes: 1 addition & 1 deletion crypto/ec/ecx_meth.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ static int ecd_item_sign25519(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_ED25519), V_ASN1_UNDEF, NULL);
if (alg2)
X509_ALGOR_set0(alg2, OBJ_nid2obj(NID_ED25519), V_ASN1_UNDEF, NULL);
/* Algorithm idetifiers set: carry on as normal */
/* Algorithm identifiers set: carry on as normal */
return 3;
}

Expand Down
2 changes: 1 addition & 1 deletion crypto/err/openssl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,7 @@ EVP_R_NO_OPERATION_SET:149:no operation set
EVP_R_ONLY_ONESHOT_SUPPORTED:177:only oneshot supported
EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE:150:\
operation not supported for this keytype
EVP_R_OPERATON_NOT_INITIALIZED:151:operaton not initialized
EVP_R_OPERATON_NOT_INITIALIZED:151:operation not initialized
EVP_R_PARAMETER_TOO_LARGE:187:parameter too large
EVP_R_PARTIALLY_OVERLAPPING:162:partially overlapping buffers
EVP_R_PBKDF2_ERROR:181:pbkdf2 error
Expand Down
2 changes: 1 addition & 1 deletion crypto/evp/evp_err.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
"operation not supported for this keytype"},
{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATON_NOT_INITIALIZED),
"operaton not initialized"},
"operation not initialized"},
{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARAMETER_TOO_LARGE),
"parameter too large"},
{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
Expand Down
2 changes: 1 addition & 1 deletion crypto/initthread.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ init_get_thread_local(CRYPTO_THREAD_LOCAL *local, int alloc, int keep)
* destructor for threads terminating before libcrypto is initialized or
* after it's de-initialized. Access to the key doesn't have to be
* serialized for the said threads, because they didn't use libcrypto
* and it doesn't matter if they pick "impossible" or derefernce real
* and it doesn't matter if they pick "impossible" or dereference real
* key value and pull NULL past initialization in the first thread that
* intends to use libcrypto.
*/
Expand Down
6 changes: 3 additions & 3 deletions crypto/lhash/lhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

/*
* A hashing implementation that appears to be based on the linear hashing
* alogrithm:
* algorithm:
* https://en.wikipedia.org/wiki/Linear_hashing
*
* Litwin, Witold (1980), "Linear hashing: A new tool for file and table
* addressing", Proc. 6th Conference on Very Large Databases: 212-223
* http://hackthology.com/pdfs/Litwin-1980-Linear_Hashing.pdf
* https://hackthology.com/pdfs/Litwin-1980-Linear_Hashing.pdf
*
* From the wikipedia article "Linear hashing is used in the BDB Berkeley
* From the Wikipedia article "Linear hashing is used in the BDB Berkeley
* database system, which in turn is used by many software systems such as
* OpenLDAP, using a C implementation derived from the CACM article and first
* published on the Usenet in 1988 by Esmond Pitt."
Expand Down
6 changes: 3 additions & 3 deletions crypto/poly1305/asm/poly1305-ppc.pl
Original file line number Diff line number Diff line change
Expand Up @@ -969,15 +969,15 @@
addi $t1,$ctx,`48+(12^$BIG_ENDIAN)`
bl __poly1305_splat
bl __poly1305_mul # caclulate r^2
bl __poly1305_mul # calculate r^2
addi $t1,$ctx,`48+(4^$BIG_ENDIAN)`
bl __poly1305_splat
bl __poly1305_mul # caclulate r^3
bl __poly1305_mul # calculate r^3
addi $t1,$ctx,`48+(8^$BIG_ENDIAN)`
bl __poly1305_splat
bl __poly1305_mul # caclulate r^4
bl __poly1305_mul # calculate r^4
addi $t1,$ctx,`48+(0^$BIG_ENDIAN)`
bl __poly1305_splat
Expand Down
2 changes: 1 addition & 1 deletion crypto/rand/drbg_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ int RAND_DRBG_instantiate(RAND_DRBG *drbg,
/*
* NIST SP800-90Ar1 section 9.1 says you can combine getting the entropy
* and nonce in 1 call by increasing the entropy with 50% and increasing
* the minimum length to accomadate the length of the nonce.
* the minimum length to accommodate the length of the nonce.
* We do this in case a nonce is require and get_nonce is NULL.
*/
if (drbg->min_noncelen > 0 && drbg->get_nonce == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion crypto/rand/rand_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void rand_cleanup_int(void)

/* TODO(3.0): Do we need to handle this somehow in the FIPS module? */
/*
* RAND_close_seed_files() ensures that any seed file decriptors are
* RAND_close_seed_files() ensures that any seed file descriptors are
* closed after use.
*/
void RAND_keep_random_devices_open(int keep)
Expand Down
2 changes: 1 addition & 1 deletion crypto/rsa/rsa_gen.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, int primes, BIGNUM *e_value,
*
* This strategy has the following goals:
*
* 1. 1024-bit factors are effcient when using 3072 and 4096-bit key
* 1. 1024-bit factors are efficient when using 3072 and 4096-bit key
* 2. stay the same logic with normal 2-prime key
*/
bitse -= bitsr[i];
Expand Down
2 changes: 1 addition & 1 deletion crypto/sha/asm/sha512-sparcv9.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# over 2x than 32-bit code. X[16] resides on stack, but access to it
# is scheduled for L2 latency and staged through 32 least significant
# bits of %l0-%l7. The latter is done to achieve 32-/64-bit ABI
# duality. Nevetheless it's ~40% faster than SHA256, which is pretty
# duality. Nevertheless it's ~40% faster than SHA256, which is pretty
# good [optimal coefficient is 50%].
#
# SHA512 on UltraSPARC T1.
Expand Down
4 changes: 2 additions & 2 deletions crypto/sm2/sm2_sign.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,

/*
* B1: verify whether r' in [1,n-1], verification failed if not
* B2: vefify whether s' in [1,n-1], verification failed if not
* B2: verify whether s' in [1,n-1], verification failed if not
* B3: set M'~=ZA || M'
* B4: calculate e'=Hv(M'~)
* B5: calculate t = (r' + s') modn, verification failed if t=0
* B6: calculate the point (x1', y1')=[s']G + [t]PA
* B7: calculate R=(e'+x1') modn, verfication pass if yes, otherwise failed
* B7: calculate R=(e'+x1') modn, verification pass if yes, otherwise failed
*/

ECDSA_SIG_get0(sig, &r, &s);
Expand Down
2 changes: 1 addition & 1 deletion crypto/sparse_array.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "internal/sparse_array.h"

/*
* How many bits are used to index each level in the tree structre?
* How many bits are used to index each level in the tree structure?
* This setting determines the number of pointers stored in each node of the
* tree used to represent the sparse array. Having more pointers reduces the
* depth of the tree but potentially wastes more memory. That is, this is a
Expand Down
4 changes: 2 additions & 2 deletions crypto/store/loader_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ typedef OSSL_STORE_INFO *(*file_try_decode_fn)(const char *pem_name,
typedef int (*file_eof_fn)(void *handler_ctx);
/*
* The destroy_ctx function is used to destroy the handler_ctx that was
* intiated by a repeatable try_decode fuction. This is only used when
* initiated by a repeatable try_decode function. This is only used when
* the handler is marked repeatable.
*/
typedef void (*file_destroy_ctx_fn)(void **handler_ctx);
Expand Down Expand Up @@ -470,7 +470,7 @@ static FILE_HANDLER PrivateKey_handler = {
};

/*
* Public key decoder. Only supports SubjectPublicKeyInfo formated keys.
* Public key decoder. Only supports SubjectPublicKeyInfo formatted keys.
*/
static OSSL_STORE_INFO *try_decode_PUBKEY(const char *pem_name,
const char *pem_header,
Expand Down
2 changes: 1 addition & 1 deletion demos/bio/descrip.mms
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ server-arg.exe : server-arg.obj
server-cmod.exe : server-cmod.obj
server-conf.exe : server-conf.obj

# Stoopid MMS doesn't infer this automatically...
# MMS doesn't infer this automatically...
client-arg.obj : client-arg.c
client-conf.obj : client-conf.c
saccept.obj : saccept.c
Expand Down
2 changes: 1 addition & 1 deletion demos/evp/aesgcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void aes_gcm_decrypt(void)
EVP_CIPHER_CTX *ctx;
int outlen, tmplen, rv;
unsigned char outbuf[1024];
printf("AES GCM Derypt:\n");
printf("AES GCM Decrypt:\n");
printf("Ciphertext:\n");
BIO_dump_fp(stdout, gcm_ct, sizeof(gcm_ct));
ctx = EVP_CIPHER_CTX_new();
Expand Down
2 changes: 1 addition & 1 deletion doc/internal/man3/openssl_ctx_get_data.pod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ as a C<CRYPTO_EX_DATA>, which allows data from diverse parts of the
library to be added and removed dynamically.
Each such data item must have a corresponding CRYPTO_EX_DATA index
associated with it. Unlike normal CRYPTO_EX_DATA objects we use static indexes
to identify data items. These are mapped transparetnly to CRYPTO_EX_DATA dynamic
to identify data items. These are mapped transparently to CRYPTO_EX_DATA dynamic
indexes internally to the implementation.
See the example further down to see how that's done.

Expand Down
2 changes: 1 addition & 1 deletion doc/internal/man3/ossl_method_construct.pod
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ must be incremented, using ossl_provider_upref().

This function is expected to set the method's reference count to 1.

=item desctruct()
=item destruct()

Decrement the I<method>'s reference count, and destruct it when
the reference count reaches zero.
Expand Down
2 changes: 1 addition & 1 deletion doc/internal/man3/ossl_provider_new.pod
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function will get called.

=item *

If no intialization function was given with ossl_provider_new(), a
If no initialization function was given with ossl_provider_new(), a
loadable module with the I<name> that was given to ossl_provider_new()
will be located and loaded, then the symbol B<OSSL_provider_init> will
be located in that module, and called.
Expand Down
2 changes: 1 addition & 1 deletion doc/man1/mac.pod
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ To see the list of supported digests, use the command I<list -digest-commands>.

=item B<cipher:string>

Used by CMAC and GMAC to specifiy the cipher algorithm.
Used by CMAC and GMAC to specify the cipher algorithm.
For CMAC it must be one of AES-128-CBC, AES-192-CBC, AES-256-CBC or
DES-EDE3-CBC.
For GMAC it should be a GCM mode cipher e.g. AES-128-GCM.
Expand Down
Loading

0 comments on commit c2969ff

Please sign in to comment.