diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-28 22:39:55 +0200 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-06-29 15:56:39 +0200 |
commit | 9d22666eb89af7f4ca5c3d52490b7da89276cf90 (patch) | |
tree | 7efbff565628c6a775e6c953199471b0e3445d08 | |
parent | Some interfaces may have IPv6 addresses even if an IPv6 address is not (diff) | |
download | openssl-9d22666eb89af7f4ca5c3d52490b7da89276cf90.tar.xz openssl-9d22666eb89af7f4ca5c3d52490b7da89276cf90.zip |
Spelling
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1264)
-rw-r--r-- | crypto/x509/x509_obj.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_addr.c | 2 | ||||
-rw-r--r-- | doc/crypto/ERR_remove_state.pod | 2 | ||||
-rw-r--r-- | doc/crypto/EVP_CIPHER_meth_new.pod | 2 | ||||
-rw-r--r-- | doc/crypto/EVP_MD_meth_new.pod | 2 | ||||
-rw-r--r-- | doc/crypto/EVP_PKEY_CTX_ctrl.pod | 3 | ||||
-rw-r--r-- | doc/crypto/EVP_PKEY_cmp.pod | 3 | ||||
-rw-r--r-- | doc/crypto/OPENSSL_ia32cap.pod | 2 | ||||
-rw-r--r-- | doc/crypto/OPENSSL_malloc.pod | 4 | ||||
-rw-r--r-- | doc/crypto/PEM_read.pod | 4 | ||||
-rw-r--r-- | doc/crypto/X509V3_get_d2i.pod | 4 | ||||
-rw-r--r-- | include/openssl/pkcs7.h | 2 | ||||
-rw-r--r-- | ssl/t1_lib.c | 2 | ||||
-rw-r--r-- | test/bioprinttest.c | 2 |
14 files changed, 19 insertions, 17 deletions
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c index ccec20d660..76fb0473a9 100644 --- a/crypto/x509/x509_obj.c +++ b/crypto/x509/x509_obj.c @@ -17,7 +17,7 @@ /* * Limit to ensure we don't overflow: much greater than - * anything enountered in practice. + * anything encountered in practice. */ #define NAME_ONELINE_MAX (1024 * 1024) diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c index be8ca5dcbb..ef1d775ac9 100644 --- a/crypto/x509v3/v3_addr.c +++ b/crypto/x509v3/v3_addr.c @@ -686,7 +686,7 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr) int i, j, k; /* - * Empty extension is cannonical. + * Empty extension is canonical. */ if (addr == NULL) return 1; diff --git a/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod index f985104cda..f2e71e3948 100644 --- a/doc/crypto/ERR_remove_state.pod +++ b/doc/crypto/ERR_remove_state.pod @@ -19,7 +19,7 @@ Deprecated: =head1 DESCRIPTION The functions described here were used to free the error queue -associated with the current or specificed thread. +associated with the current or specified thread. They are now deprecated and do nothing, as the OpenSSL libraries now normally do all thread initialisation and deinitialisation diff --git a/doc/crypto/EVP_CIPHER_meth_new.pod b/doc/crypto/EVP_CIPHER_meth_new.pod index f9b1f6e0dd..6e18ed5412 100644 --- a/doc/crypto/EVP_CIPHER_meth_new.pod +++ b/doc/crypto/EVP_CIPHER_meth_new.pod @@ -196,7 +196,7 @@ EVP_EncryptFinal(), EVP_EncryptFinal_ex(), EVP_DecryptFinal() and EVP_DecryptFinal_ex(). EVP_CIPHER_meth_set_cleanup() sets the function for B<cipher> to do -extra cleanup before the method's privata data structure is cleaned +extra cleanup before the method's private data structure is cleaned out and freed. Note that the cleanup function is passed a B<EVP_CIPHER_CTX *>, the private data structure is then available with diff --git a/doc/crypto/EVP_MD_meth_new.pod b/doc/crypto/EVP_MD_meth_new.pod index 6aab174ac9..c15a31e7fc 100644 --- a/doc/crypto/EVP_MD_meth_new.pod +++ b/doc/crypto/EVP_MD_meth_new.pod @@ -131,7 +131,7 @@ This copy function is called by EVP_MD_CTX_copy() and EVP_MD_CTX_copy_ex(). EVP_MD_meth_set_cleanup() sets the function for B<md> to do extra -cleanup before the method's privata data structure is cleaned out and +cleanup before the method's private data structure is cleaned out and freed. Note that the cleanup function is passed a B<EVP_MD_CTX *>, the private data structure is then available with EVP_MD_CTX_md_data(). diff --git a/doc/crypto/EVP_PKEY_CTX_ctrl.pod b/doc/crypto/EVP_PKEY_CTX_ctrl.pod index c9b7fdd476..a30450bb46 100644 --- a/doc/crypto/EVP_PKEY_CTX_ctrl.pod +++ b/doc/crypto/EVP_PKEY_CTX_ctrl.pod @@ -78,7 +78,8 @@ to PKCS#1 when signing and this structure is expected (and stripped off) when verifying. If this control is not used with RSA and PKCS#1 padding then the supplied data is used directly and not encapsulated. In the case of X9.31 padding for RSA the algorithm identifier byte is added or checked and removed -if this control is called. If it is not called then the first byte of the plaintext buffer is expected to be the algorithm identifier byte. +if this control is called. If it is not called then the first byte of the plaintext +buffer is expected to be the algorithm identifier byte. The EVP_PKEY_CTX_set_rsa_pss_saltlen() macro sets the RSA PSS salt length to B<len> as its name implies it is only supported for PSS padding. Two special diff --git a/doc/crypto/EVP_PKEY_cmp.pod b/doc/crypto/EVP_PKEY_cmp.pod index 7c9e582a81..270d635ce2 100644 --- a/doc/crypto/EVP_PKEY_cmp.pod +++ b/doc/crypto/EVP_PKEY_cmp.pod @@ -2,7 +2,8 @@ =head1 NAME -EVP_PKEY_copy_parameters, EVP_PKEY_missing_parameters, EVP_PKEY_cmp_parameters, EVP_PKEY_cmp - public key parameter and comparison functions +EVP_PKEY_copy_parameters, EVP_PKEY_missing_parameters, EVP_PKEY_cmp_parameters, +EVP_PKEY_cmp - public key parameter and comparison functions =head1 SYNOPSIS diff --git a/doc/crypto/OPENSSL_ia32cap.pod b/doc/crypto/OPENSSL_ia32cap.pod index e062e287f4..7b8629def0 100644 --- a/doc/crypto/OPENSSL_ia32cap.pod +++ b/doc/crypto/OPENSSL_ia32cap.pod @@ -69,7 +69,7 @@ executed on SSE2 capable CPU, but under control of OS that does not enable XMM registers. Historically address of the capability vector copy was exposed to application through OPENSSL_ia32cap_loc(), but not anymore. Now the only way to affect the capability detection is to set -OPENSSL_ia32cap envrionment variable prior target application start. To +OPENSSL_ia32cap environment variable prior target application start. To give a specific example, on Intel P4 processor 'env OPENSSL_ia32cap=0x16980010 apps/openssl', or better yet 'env OPENSSL_ia32cap=~0x1000000 apps/openssl' would achieve the desired diff --git a/doc/crypto/OPENSSL_malloc.pod b/doc/crypto/OPENSSL_malloc.pod index 5d254f7b90..cd89897b60 100644 --- a/doc/crypto/OPENSSL_malloc.pod +++ b/doc/crypto/OPENSSL_malloc.pod @@ -103,13 +103,13 @@ OPENSSL_cleanse() fills B<ptr> of size B<len> with a string of 0's. Use OPENSSL_cleanse() with care if the memory is a mapping of a file. If the storage controller uses write compression, then its possible that sensitive tail bytes will survive zeroization because the block of -zeros will be compressed. If the storage controller uses wear leveling, +zeros will be compressed. If the storage controller uses wear levelling, then the old sensitive data will not be overwritten; rather, a block of 0's will be written at a new physical location. OPENSSL_strdup(), OPENSSL_strndup() and OPENSSL_memdup() are like the equivalent C functions, except that memory is allocated by calling the -OPENSSL_malloc() and should be releaed by calling OPENSSL_free(). +OPENSSL_malloc() and should be released by calling OPENSSL_free(). OPENSSL_strlcpy(), OPENSSL_strlcat() and OPENSSL_strnlen() are equivalents of the common C diff --git a/doc/crypto/PEM_read.pod b/doc/crypto/PEM_read.pod index 3c6d2fd03b..167693dec1 100644 --- a/doc/crypto/PEM_read.pod +++ b/doc/crypto/PEM_read.pod @@ -57,7 +57,7 @@ for examples. PEM_read() reads from the file B<fp>, while PEM_read_bio() reads from the BIO B<bp>. Both skip any non-PEM data that precedes the start of the next PEM object. -When an object is successfuly retrieved, the type name from the "----BEGIN +When an object is successfully retrieved, the type name from the "----BEGIN <type>-----" is returned via the B<name> argument, any encapsulation headers are returned in B<header> and the base64-decoded content and its length are returned via B<data> and B<len> respectively. @@ -69,7 +69,7 @@ PEM_read() or PEM_read_bio() is encrypted and to retrieve the associated cipher and IV. The caller passes a pointer to structure of type B<EVP_CIPHER_INFO> via the B<cinfo> argument and the B<header> returned via PEM_read() or PEM_read_bio(). -If the call is succesful 1 is retured and the cipher and IV are stored at the +If the call is successful 1 is returned and the cipher and IV are stored at the address pointed to by B<cinfo>. When the header is malformed, or not supported or when the cipher is unknown or some internal error happens 0 is returned. diff --git a/doc/crypto/X509V3_get_d2i.pod b/doc/crypto/X509V3_get_d2i.pod index f6f9be6694..89dc875886 100644 --- a/doc/crypto/X509V3_get_d2i.pod +++ b/doc/crypto/X509V3_get_d2i.pod @@ -89,7 +89,7 @@ exist. B<X509V3_ADD_APPEND> appends a new extension, ignoring whether the extension already exists. -B<X509V3_ADD_REPLACE> replaces an extension if it exists otherwise apppends +B<X509V3_ADD_REPLACE> replaces an extension if it exists otherwise appends a new extension. B<X509V3_ADD_REPLACE_EXISTING> replaces an existing extension if it exists @@ -99,7 +99,7 @@ B<X509V3_ADD_KEEP_EXISTING> appends a new extension only if the extension does not already exist. An error B<is not> returned if the extension does already exist. -B<X509V3_ADD_DELETE> extension B<nid> is deleted: no new extenion is added. +B<X509V3_ADD_DELETE> extension B<nid> is deleted: no new extension is added. If B<X509V3_ADD_SILENT> is ored with B<flags>: any error returned will not be added to the error queue. diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h index 6de664f9e7..6148cec993 100644 --- a/include/openssl/pkcs7.h +++ b/include/openssl/pkcs7.h @@ -22,7 +22,7 @@ extern "C" { #endif # ifdef OPENSSL_SYS_WIN32 -/* Under Win32 thes are defined in wincrypt.h */ +/* Under Win32 these are defined in wincrypt.h */ # undef PKCS7_ISSUER_AND_SERIAL # undef PKCS7_SIGNER_INFO # endif diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 3e27d65039..e938d87de7 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -3604,7 +3604,7 @@ static int sig_cb(const char *elem, int len, void *arg) } /* - * Set suppored signature algorithms based on a colon separated list of the + * Set supported signature algorithms based on a colon separated list of the * form sig+hash e.g. RSA+SHA512:DSA+SHA512 */ int tls1_set_sigalgs_list(CERT *c, const char *str, int client) diff --git a/test/bioprinttest.c b/test/bioprinttest.c index c69a79c419..6f591a1a18 100644 --- a/test/bioprinttest.c +++ b/test/bioprinttest.c @@ -202,7 +202,7 @@ int main(int argc, char **argv) /* Test excessively big number. Should fail */ if (BIO_snprintf(buf, sizeof(buf), "%f\n", 2 * (double)ULONG_MAX) != -1) { - printf("Test %d failed. Unexecpted success return from " + printf("Test %d failed. Unexpected success return from " "BIO_snprintf()\n", test); fail = 1; } |