From c2969ff6e70b10f71fbd97c1d0b0cffc92bd69df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20C=C5=93ur?= Date: Tue, 2 Jul 2019 16:04:04 +0800 Subject: Fix Typos CLA: trivial Reviewed-by: Richard Levitte Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/9288) --- doc/internal/man3/openssl_ctx_get_data.pod | 2 +- doc/internal/man3/ossl_method_construct.pod | 2 +- doc/internal/man3/ossl_provider_new.pod | 2 +- doc/man1/mac.pod | 2 +- doc/man3/ADMISSIONS.pod | 2 +- doc/man3/BIO_s_mem.pod | 2 +- doc/man3/EVP_DigestSignInit.pod | 2 +- doc/man3/EVP_DigestVerifyInit.pod | 2 +- doc/man3/EVP_MD_fetch.pod | 4 ++-- doc/man3/EVP_md5.pod | 2 +- doc/man3/OSSL_CRMF_pbmp_new.pod | 2 +- doc/man3/OSSL_PARAM_int.pod | 4 ++-- doc/man3/OSSL_STORE_LOADER.pod | 2 +- doc/man3/OSSL_STORE_expect.pod | 2 +- doc/man3/RAND_DRBG_set_callbacks.pod | 2 +- doc/man3/SSL_CTX_set_cipher_list.pod | 2 +- doc/man3/SSL_CTX_set_srp_password.pod | 2 +- doc/man3/SSL_SESSION_get0_hostname.pod | 2 +- doc/man3/SSL_write.pod | 2 +- doc/man7/EVP_KDF_SS.pod | 2 +- doc/man7/EVP_KDF_SSHKDF.pod | 8 ++++---- doc/man7/EVP_KDF_X963.pod | 2 +- doc/man7/property.pod | 4 ++-- 23 files changed, 29 insertions(+), 29 deletions(-) (limited to 'doc') diff --git a/doc/internal/man3/openssl_ctx_get_data.pod b/doc/internal/man3/openssl_ctx_get_data.pod index d9b3f5dd43..3d821b5fba 100644 --- a/doc/internal/man3/openssl_ctx_get_data.pod +++ b/doc/internal/man3/openssl_ctx_get_data.pod @@ -29,7 +29,7 @@ as a C, 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. diff --git a/doc/internal/man3/ossl_method_construct.pod b/doc/internal/man3/ossl_method_construct.pod index ecb99e080b..c3c7319c47 100644 --- a/doc/internal/man3/ossl_method_construct.pod +++ b/doc/internal/man3/ossl_method_construct.pod @@ -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's reference count, and destruct it when the reference count reaches zero. diff --git a/doc/internal/man3/ossl_provider_new.pod b/doc/internal/man3/ossl_provider_new.pod index 5a8e97b1c2..b1018e2957 100644 --- a/doc/internal/man3/ossl_provider_new.pod +++ b/doc/internal/man3/ossl_provider_new.pod @@ -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 that was given to ossl_provider_new() will be located and loaded, then the symbol B will be located in that module, and called. diff --git a/doc/man1/mac.pod b/doc/man1/mac.pod index 5d1e796657..3143df8d15 100644 --- a/doc/man1/mac.pod +++ b/doc/man1/mac.pod @@ -76,7 +76,7 @@ To see the list of supported digests, use the command I. =item B -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. diff --git a/doc/man3/ADMISSIONS.pod b/doc/man3/ADMISSIONS.pod index 759012338c..f86aac922a 100644 --- a/doc/man3/ADMISSIONS.pod +++ b/doc/man3/ADMISSIONS.pod @@ -130,7 +130,7 @@ ADMISSION_SYNTAX_set0_contentsOfAdmissions() functions free any existing value and set the pointer to the specified value. The B type has an authority name, authority object, and a -stack of B items. +stack of B items. The ADMISSIONS_get0_admissionAuthority(), ADMISSIONS_get0_namingAuthority(), and ADMISSIONS_get0_professionInfos() functions return pointers to those values within the object. diff --git a/doc/man3/BIO_s_mem.pod b/doc/man3/BIO_s_mem.pod index 42fc294417..7cb9efa92c 100644 --- a/doc/man3/BIO_s_mem.pod +++ b/doc/man3/BIO_s_mem.pod @@ -109,7 +109,7 @@ Calling BIO_reset() on a read write memory BIO with BIO_FLAGS_NONCLEAR_RST flag set can have unexpected outcome when the reads and writes to the BIO are intertwined. As documented above the BIO will be reset to the state after the last completed write operation. The effects of reads -preceeding that write operation cannot be undone. +preceding that write operation cannot be undone. Calling BIO_get_mem_ptr() prior to a BIO_reset() call with BIO_FLAGS_NONCLEAR_RST set has the same effect as a write operation. diff --git a/doc/man3/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod index 4c497fafa0..0f9c952303 100644 --- a/doc/man3/EVP_DigestSignInit.pod +++ b/doc/man3/EVP_DigestSignInit.pod @@ -35,7 +35,7 @@ EVP_MD_CTX is freed). The digest B may be NULL if the signing algorithm supports it. -No B will be created by EVP_DigsetSignInit() if the passed B +No B will be created by EVP_DigestSignInit() if the passed B has already been assigned one via L. See also L. Only EVP_PKEY types that support signing can be used with these functions. This diff --git a/doc/man3/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod index 9e2a045f66..97bb773722 100644 --- a/doc/man3/EVP_DigestVerifyInit.pod +++ b/doc/man3/EVP_DigestVerifyInit.pod @@ -32,7 +32,7 @@ being passed to EVP_DigestVerifyInit() (which means the EVP_PKEY_CTX is created inside EVP_DigestVerifyInit() and it will be freed automatically when the EVP_MD_CTX is freed). -No B will be created by EVP_DigsetSignInit() if the passed B +No B will be created by EVP_DigestSignInit() if the passed B has already been assigned one via L. See also L. EVP_DigestVerifyUpdate() hashes B bytes of data at B into the diff --git a/doc/man3/EVP_MD_fetch.pod b/doc/man3/EVP_MD_fetch.pod index f229292a50..1e43b4fb93 100644 --- a/doc/man3/EVP_MD_fetch.pod +++ b/doc/man3/EVP_MD_fetch.pod @@ -140,7 +140,7 @@ See L. Where an application that previously used implicit fetch is converted to use explicit fetch care should be taken with the L function. -Specifically, this function returns the EVP_MD object orginally passed to +Specifically, this function returns the EVP_MD object originally passed to EVP_DigestInit_ex() (or other similar function). With implicit fetch the returned EVP_MD object is guaranteed to be available throughout the application lifetime. However, with explicit fetch EVP_MD objects are reference counted. @@ -199,7 +199,7 @@ implementation of whirlpool from it: EVP_MD_meth_free(md); Note that in the above example the property string "legacy=yes" is optional -since, assuming no other providers have been loaded, the only implmentation of +since, assuming no other providers have been loaded, the only implementation of the "whirlpool" algorithm is in the "legacy" provider. Also note that the default provider should be explicitly loaded if it is required in addition to other providers: diff --git a/doc/man3/EVP_md5.pod b/doc/man3/EVP_md5.pod index 01d7157b04..a0b127fe60 100644 --- a/doc/man3/EVP_md5.pod +++ b/doc/man3/EVP_md5.pod @@ -29,7 +29,7 @@ The MD5 algorithm which produces a 128-bit output from a given input. =item EVP_md5_sha1() -A hash algorithm of SSL v3 that combines MD5 with SHA-1 as decirbed in RFC +A hash algorithm of SSL v3 that combines MD5 with SHA-1 as described in RFC 6101. WARNING: this algorithm is not intended for non-SSL usage. diff --git a/doc/man3/OSSL_CRMF_pbmp_new.pod b/doc/man3/OSSL_CRMF_pbmp_new.pod index 877fee65c2..cdd30ffca1 100644 --- a/doc/man3/OSSL_CRMF_pbmp_new.pod +++ b/doc/man3/OSSL_CRMF_pbmp_new.pod @@ -22,7 +22,7 @@ OSSL_CRMF_pbmp_new OSSL_CRMF_pbm_new() generates a PBM (Password-Based MAC) based on given PBM parameters B, message B, and secret B, along with the respective -lengths B and B. On success writes the adddress of the newly +lengths B and B. On success writes the address of the newly allocated MAC via the B reference parameter and writes the length via the B reference parameter unless it its NULL. diff --git a/doc/man3/OSSL_PARAM_int.pod b/doc/man3/OSSL_PARAM_int.pod index 6d19068962..3aa6141f0c 100644 --- a/doc/man3/OSSL_PARAM_int.pod +++ b/doc/man3/OSSL_PARAM_int.pod @@ -186,7 +186,7 @@ OSSL_PARAM_get_TYPE() retrieves a value of type B from the parameter B

. The value is copied to the address B. Type coercion takes place as discussed in the NOTES section. -OSSL_PARAM_set_TYPE() stores a value B of type B into the paramter +OSSL_PARAM_set_TYPE() stores a value B of type B into the parameter B

. Type coercion takes place as discussed in the NOTES section. @@ -194,7 +194,7 @@ OSSL_PARAM_get_BN() retrieves a BIGNUM from the parameter pointed to by B

. The BIGNUM referenced by B is updated and is allocated if B<*val> is B. -OSSL_PARAM_set_BN() stores the BIGNUM B into the paramater B

. +OSSL_PARAM_set_BN() stores the BIGNUM B into the parameter B

. OSSL_PARAM_get_utf8_string() retrieves a UTF8 string from the parameter pointed to by B

. diff --git a/doc/man3/OSSL_STORE_LOADER.pod b/doc/man3/OSSL_STORE_LOADER.pod index 0a4d2f7a6d..101857d543 100644 --- a/doc/man3/OSSL_STORE_LOADER.pod +++ b/doc/man3/OSSL_STORE_LOADER.pod @@ -95,7 +95,7 @@ manner possible according to the scheme the loader implements, it also takes a B and associated data, to be used any time something needs to be prompted for. Furthermore, this function is expected to initialize what needs to be -initialized, to create a privata data store (B, see +initialized, to create a private data store (B, see above), and to return it. If something goes wrong, this function is expected to return NULL. diff --git a/doc/man3/OSSL_STORE_expect.pod b/doc/man3/OSSL_STORE_expect.pod index 05d6ea3546..1a270c8490 100644 --- a/doc/man3/OSSL_STORE_expect.pod +++ b/doc/man3/OSSL_STORE_expect.pod @@ -32,7 +32,7 @@ grained search of objects. OSSL_STORE_supports_search() checks if the loader of the given OSSL_STORE context supports the given search type. -See L for information on the +See L for information on the supported search criterion types. OSSL_STORE_expect() and OSSL_STORE_find I be called before the first diff --git a/doc/man3/RAND_DRBG_set_callbacks.pod b/doc/man3/RAND_DRBG_set_callbacks.pod index 09a6ef1f7e..695c1903e9 100644 --- a/doc/man3/RAND_DRBG_set_callbacks.pod +++ b/doc/man3/RAND_DRBG_set_callbacks.pod @@ -111,7 +111,7 @@ and is being used. The derivation function is disabled during initialization by calling the RAND_DRBG_set() function with the RAND_DRBG_FLAG_CTR_NO_DF flag. For more information on the derivation function and when it can be omitted, -see [NIST SP 800-90A Rev. 1]. Roughly speeking it can be omitted if the random +see [NIST SP 800-90A Rev. 1]. Roughly speaking it can be omitted if the random source has "full entropy", i.e., contains 8 bits of entropy per byte. Even if a nonce is required, the B() and B() diff --git a/doc/man3/SSL_CTX_set_cipher_list.pod b/doc/man3/SSL_CTX_set_cipher_list.pod index 2780e990f6..1852405421 100644 --- a/doc/man3/SSL_CTX_set_cipher_list.pod +++ b/doc/man3/SSL_CTX_set_cipher_list.pod @@ -36,7 +36,7 @@ B. SSL_CTX_set_ciphersuites() is used to configure the available TLSv1.3 ciphersuites for B. This is a simple colon (":") separated list of TLSv1.3 -ciphersuite names in order of perference. Valid TLSv1.3 ciphersuite names are: +ciphersuite names in order of preference. Valid TLSv1.3 ciphersuite names are: =over 4 diff --git a/doc/man3/SSL_CTX_set_srp_password.pod b/doc/man3/SSL_CTX_set_srp_password.pod index 0936885ff8..b8a5873cc4 100644 --- a/doc/man3/SSL_CTX_set_srp_password.pod +++ b/doc/man3/SSL_CTX_set_srp_password.pod @@ -111,7 +111,7 @@ user salt, B the password verifier and B is the optional user info. The SSL_set_srp_server_param_pw() function sets all SRP parameters for the connection B by generating a random salt and a password verifier. -B is the username, B the password and B the SRP group paramters +B is the username, B the password and B the SRP group parameters identifier for L. The SSL_get_srp_g() function returns the SRP group generator for B, or from diff --git a/doc/man3/SSL_SESSION_get0_hostname.pod b/doc/man3/SSL_SESSION_get0_hostname.pod index f54a21d8e0..5a0e769409 100644 --- a/doc/man3/SSL_SESSION_get0_hostname.pod +++ b/doc/man3/SSL_SESSION_get0_hostname.pod @@ -6,7 +6,7 @@ SSL_SESSION_get0_hostname, SSL_SESSION_set1_hostname, SSL_SESSION_get0_alpn_selected, SSL_SESSION_set1_alpn_selected -- get and set SNI and ALPN data ssociated with a session +- get and set SNI and ALPN data associated with a session =head1 SYNOPSIS diff --git a/doc/man3/SSL_write.pod b/doc/man3/SSL_write.pod index b18c215cac..a1ceb20250 100644 --- a/doc/man3/SSL_write.pod +++ b/doc/man3/SSL_write.pod @@ -125,7 +125,7 @@ of bytes of the file written to the TLS/SSL connection. =item E 0 The write operation was not successful, because either the connection was -closed, an error occured or action must be taken by the calling process. +closed, an error occurred or action must be taken by the calling process. Call SSL_get_error() with the return value to find out the reason. =back diff --git a/doc/man7/EVP_KDF_SS.pod b/doc/man7/EVP_KDF_SS.pod index 3702ffe6c1..b3de26a464 100644 --- a/doc/man7/EVP_KDF_SS.pod +++ b/doc/man7/EVP_KDF_SS.pod @@ -11,7 +11,7 @@ SSKDF derives a key using input such as a shared secret key (that was generated during the execution of a key establishment scheme) and fixedinfo. SSKDF is also informally referred to as 'Concat KDF'. -=head2 Auxilary function +=head2 Auxiliary function The implementation uses a selectable auxiliary function H, which can be one of: diff --git a/doc/man7/EVP_KDF_SSHKDF.pod b/doc/man7/EVP_KDF_SSHKDF.pod index 9c9734e7c3..e233e86f03 100644 --- a/doc/man7/EVP_KDF_SSHKDF.pod +++ b/doc/man7/EVP_KDF_SSHKDF.pod @@ -68,12 +68,12 @@ Sets the type for the SSHHKDF operation. There are six supported types: =over 4 -=item EVP_KDF_SSHKDF_TYPE_ININITAL_IV_CLI_TO_SRV +=item EVP_KDF_SSHKDF_TYPE_INITIAL_IV_CLI_TO_SRV The Initial IV from client to server. A single char of value 65 (ASCII char 'A'). -=item EVP_KDF_SSHKDF_TYPE_ININITAL_IV_SRV_TO_CLI +=item EVP_KDF_SSHKDF_TYPE_INITIAL_IV_SRV_TO_CLI The Initial IV from server to client A single char of value 66 (ASCII char 'B'). @@ -103,7 +103,7 @@ A single char of value 70 (ASCII char 'F'). EVP_KDF_ctrl_str() type string: "type" The value is a string of length one character. The only valid values -are the numerical values of the ASCII caracters: "A" (65) to "F" (70). +are the numerical values of the ASCII characters: "A" (65) to "F" (70). =back @@ -142,7 +142,7 @@ This example derives an 8 byte IV using SHA-256 with a 1K "key" and appropriate if (EVP_KDF_CTX_set1_sshkdf_session_id(kctx, session_id, 32) <= 0) /* Error */ if (EVP_KDF_CTX_set_sshkdf_type(kctx, - EVP_KDF_SSHKDF_TYPE_ININITAL_IV_CLI_TO_SRV) <= 0) + EVP_KDF_SSHKDF_TYPE_INITIAL_IV_CLI_TO_SRV) <= 0) /* Error */ if (EVP_KDF_derive(kctx, out, &outlen) <= 0) /* Error */ diff --git a/doc/man7/EVP_KDF_X963.pod b/doc/man7/EVP_KDF_X963.pod index 11789ae5aa..eaea6da23c 100644 --- a/doc/man7/EVP_KDF_X963.pod +++ b/doc/man7/EVP_KDF_X963.pod @@ -71,7 +71,7 @@ decoded before being passed on as the control value. =head1 NOTES -X963KDF is very similar to the SSKDF that uses a digest as the auxilary function, +X963KDF is very similar to the SSKDF that uses a digest as the auxiliary function, X963KDF appends the counter to the secret, whereas SSKDF prepends the counter. A context for X963KDF can be obtained by calling: diff --git a/doc/man7/property.pod b/doc/man7/property.pod index a9b2a776d1..5b329ee6f3 100644 --- a/doc/man7/property.pod +++ b/doc/man7/property.pod @@ -68,7 +68,7 @@ Matching such clauses is not a requirement, but any additional optional match counts in favor of the algorithm. More details about that in the B section. A I is a sequence of comma separated property query clauses. -The full syntax for property queries appears below, but the available syntatic +The full syntax for property queries appears below, but the available syntactic features are: =over 4 @@ -129,7 +129,7 @@ Where both the context and local queries include a clause with the same name, the local clause overrides the context clause. It is possible for a local property query to remove a clause in the context -property query by preceeding the property name with a '-'. +property query by preceding the property name with a '-'. For example, a context property query that contains "fips=yes" would normally result in implementations that have "fips=yes". -- cgit v1.2.3