From 27b138e9db91bdfa1e3c55b0c3c9b2f02b5c0bf1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 19 May 2017 00:16:38 +0000 Subject: [PATCH] Fix spelling errors in manpages spelling: algorithm spelling: anyway spelling: assigned spelling: authenticated spelling: callback spelling: certificate spelling: compatibility spelling: configuration spelling: digest spelling: encrypted spelling: function spelling: output spelling: receive spelling: renegotiation spelling: signing spelling: similar spelling: string (Merged from https://github.com/openssl/openssl/pull/3580)Reviewed-by: Rich Salz Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/3580) --- doc/man1/cms.pod | 2 +- doc/man3/BIO_set_callback.pod | 6 +++--- doc/man3/EVP_DigestSignInit.pod | 2 +- doc/man3/EVP_DigestVerifyInit.pod | 4 ++-- doc/man3/PKCS7_sign.pod | 2 +- doc/man3/PKCS7_sign_add_signer.pod | 2 +- doc/man3/SSL_CTX_config.pod | 3 ++- doc/man3/SSL_CTX_set_early_cb.pod | 2 +- doc/man3/SSL_CTX_set_record_padding_callback.pod | 2 +- doc/man3/SSL_key_update.pod | 4 ++-- doc/man3/SSL_read_early_data.pod | 4 ++-- doc/man3/SSL_write.pod | 2 +- doc/man3/X509_get0_notBefore.pod | 2 +- doc/man3/d2i_X509.pod | 2 +- doc/man5/x509v3_config.pod | 2 +- doc/man7/RSA-PSS.pod | 2 +- 16 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/man1/cms.pod b/doc/man1/cms.pod index 21e5bdea9e..c63ac4543a 100644 --- a/doc/man1/cms.pod +++ b/doc/man1/cms.pod @@ -185,7 +185,7 @@ output an error. =item B<-EncryptedData_encrypt> Encrypt content using supplied symmetric key and algorithm using a CMS -B type and output the content. +B type and output the content. =item B<-sign_receipt> diff --git a/doc/man3/BIO_set_callback.pod b/doc/man3/BIO_set_callback.pod index ac017e7243..c6a626770b 100644 --- a/doc/man3/BIO_set_callback.pod +++ b/doc/man3/BIO_set_callback.pod @@ -20,8 +20,8 @@ BIO_callback_fn_ex, BIO_callback_fn void BIO_set_callback_ex(BIO *b, BIO_callback_fn_ex callback); BIO_callback_fn_ex BIO_get_callback_ex(const BIO *b); - void BIO_set_callback(BIO *b, BIO_callack_fn cb); - BIO_callack_fn BIO_get_callback(BIO *b); + void BIO_set_callback(BIO *b, BIO_callback_fn cb); + BIO_callback_fn BIO_get_callback(BIO *b); void BIO_set_callback_arg(BIO *b, char *arg); char *BIO_get_callback_arg(const BIO *b); @@ -37,7 +37,7 @@ operation. BIO_set_callback() and BIO_get_callback() set and retrieve the old format BIO callback. New code should not use these functions, but they are retained for -backwards compatbility. Any callback set via BIO_set_callback_ex() will get +backwards compatibility. Any callback set via BIO_set_callback_ex() will get called in preference to any set by BIO_set_callback(). BIO_set_callback_arg() and BIO_get_callback_arg() are macros which can be diff --git a/doc/man3/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod index 4990eeeeeb..1f1a06c63f 100644 --- a/doc/man3/EVP_DigestSignInit.pod +++ b/doc/man3/EVP_DigestSignInit.pod @@ -41,7 +41,7 @@ call is successful the signature is written to B and the amount of data written to B. EVP_DigestSign() signs B bytes of data at B and places the -signature in B and its length in B in a simiilar way to +signature in B and its length in B in a similar way to EVP_DigestSignFinal(). =head1 RETURN VALUES diff --git a/doc/man3/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod index a1f0473958..481cea59cf 100644 --- a/doc/man3/EVP_DigestVerifyInit.pod +++ b/doc/man3/EVP_DigestVerifyInit.pod @@ -35,7 +35,7 @@ using a macro. EVP_DigestVerifyFinal() verifies the data in B against the signature in B of length B. -EVP_DogestVerify() verifies B bytes at B against the signature +EVP_DigestVerify() verifies B bytes at B against the signature in B of length B. =head1 RETURN VALUES @@ -57,7 +57,7 @@ The B interface to digital signatures should almost always be used in preference to the low level interfaces. This is because the code then becomes transparent to the algorithm used and much more flexible. -EVP_DigesVerify() is a one shot operation which verifies a single block of +EVP_DigestVerify() is a one shot operation which verifies a single block of data in one function. For algorithms that support streaming it is equivalent to calling EVP_DigestVerifyUpdate() and EVP_DigestVerifyFinal(). For algorithms which do not support streaming (e.g. PureEdDSA) it is the only way diff --git a/doc/man3/PKCS7_sign.pod b/doc/man3/PKCS7_sign.pod index 567d7db0cd..c1df5f19a0 100644 --- a/doc/man3/PKCS7_sign.pod +++ b/doc/man3/PKCS7_sign.pod @@ -47,7 +47,7 @@ required by the S/MIME specifications) if B is set no translation occurs. This option should be used if the supplied data is in binary format otherwise the translation will corrupt it. -The signedData structure includes several PKCS#7 autenticatedAttributes +The signedData structure includes several PKCS#7 authenticatedAttributes including the signing time, the PKCS#7 content type and the supported list of ciphers in an SMIMECapabilities attribute. If B is set then no authenticatedAttributes will be used. If B is set then just diff --git a/doc/man3/PKCS7_sign_add_signer.pod b/doc/man3/PKCS7_sign_add_signer.pod index 048a94817a..2bc6c40bd2 100644 --- a/doc/man3/PKCS7_sign_add_signer.pod +++ b/doc/man3/PKCS7_sign_add_signer.pod @@ -56,7 +56,7 @@ B parameter though. This can reduce the size of the signature if the signers certificate can be obtained by other means: for example a previously signed message. -The signedData structure includes several PKCS#7 autenticatedAttributes +The signedData structure includes several PKCS#7 authenticatedAttributes including the signing time, the PKCS#7 content type and the supported list of ciphers in an SMIMECapabilities attribute. If B is set then no authenticatedAttributes will be used. If B is set then just diff --git a/doc/man3/SSL_CTX_config.pod b/doc/man3/SSL_CTX_config.pod index 2506dd597e..5b2aed76c2 100644 --- a/doc/man3/SSL_CTX_config.pod +++ b/doc/man3/SSL_CTX_config.pod @@ -40,7 +40,8 @@ If the file "config.cnf" contains the following: testapp = test_sect [test_sect] - # list of confuration modules + # list of configuration modules + ssl_conf = ssl_sect [ssl_sect] diff --git a/doc/man3/SSL_CTX_set_early_cb.pod b/doc/man3/SSL_CTX_set_early_cb.pod index 880576d741..771e4ca0a7 100644 --- a/doc/man3/SSL_CTX_set_early_cb.pod +++ b/doc/man3/SSL_CTX_set_early_cb.pod @@ -82,7 +82,7 @@ SSL_early_isv2() returns 1 for SSLv2-format ClientHellos and 0 otherwise. SSL_early_get0_random(), SSL_early_get0_session_id(), SSL_early_get0_ciphers(), and SSL_early_get0_compression_methods() return the length of the corresponding -ClientHello fields. If zero is returned, the ouput pointer should not be +ClientHello fields. If zero is returned, the output pointer should not be assumed to be valid. SSL_early_get0_ext() returns 1 if the extension of type 'type' is present, and diff --git a/doc/man3/SSL_CTX_set_record_padding_callback.pod b/doc/man3/SSL_CTX_set_record_padding_callback.pod index 9eea2bc9df..d0b2e30f25 100644 --- a/doc/man3/SSL_CTX_set_record_padding_callback.pod +++ b/doc/man3/SSL_CTX_set_record_padding_callback.pod @@ -54,7 +54,7 @@ or SSL_set_record_padding_callback_arg(). =head1 RETURN VALUES The SSL_CTX_get_record_padding_callback_arg() and SSL_get_record_padding_callback_arg() -functions return the B value assignd in the corresponding set functions. +functions return the B value assigned in the corresponding set functions. The SSL_CTX_set_block_padding() and SSL_set_block_padding() functions return 1 on success or 0 if B is too large. diff --git a/doc/man3/SSL_key_update.pod b/doc/man3/SSL_key_update.pod index 5b62234350..7772b70bc6 100644 --- a/doc/man3/SSL_key_update.pod +++ b/doc/man3/SSL_key_update.pod @@ -74,7 +74,7 @@ new handshake. For historical reasons, DTLS clients will not attempt to resume the session in the new handshake. The SSL_renegotiate_pending() function returns 1 if a renegotiation or -rengotiation request has been scheduled but not yet acted on, or 0 otherwise. +renegotiation request has been scheduled but not yet acted on, or 0 otherwise. =head1 RETURN VALUES @@ -84,7 +84,7 @@ on success or 0 on error. SSL_get_key_update_type() returns the update type of the pending key update operation or SSL_KEY_UPDATE_NONE if there is none. -SSL_renegotiate_pending() returns 1 if a renegotiation or rengotiation request +SSL_renegotiate_pending() returns 1 if a renegotiation or renegotiation request has been scheduled but not yet acted on, or 0 otherwise. =head1 SEE ALSO diff --git a/doc/man3/SSL_read_early_data.pod b/doc/man3/SSL_read_early_data.pod index dd57cefefb..38dffe5652 100644 --- a/doc/man3/SSL_read_early_data.pod +++ b/doc/man3/SSL_read_early_data.pod @@ -30,7 +30,7 @@ SSL_get_early_data_status =head1 DESCRIPTION -These functions are used to send and recieve early data where TLSv1.3 has been +These functions are used to send and receive early data where TLSv1.3 has been negotiated. Early data can be sent by the client immediately after its initial ClientHello without having to wait for the server to complete the handshake. Early data can only be sent if a session has previously been established with @@ -152,7 +152,7 @@ connection immediately without further need to call a function such as L. This can happen if the client is using a protocol version less than TLSv1.3. Applications can test for this by calling L. Alternatively, applications may choose to call -L anway. Such a call will successfully return immediately with no +L anyway. Such a call will successfully return immediately with no further action taken. When a session is created between a server and a client the server will specify diff --git a/doc/man3/SSL_write.pod b/doc/man3/SSL_write.pod index 2a751107bb..14b651a1c3 100644 --- a/doc/man3/SSL_write.pod +++ b/doc/man3/SSL_write.pod @@ -25,7 +25,7 @@ SSL_write_ex(), or SSL_write(). If necessary, a write function will negotiate a TLS/SSL session, if not already explicitly performed by L or L. If the peer requests a re-negotiation, it will be performed transparently during -the write functio operation. The behaviour of the write functions depends on the +the write function operation. The behaviour of the write functions depends on the underlying BIO. For the transparent negotiation to succeed, the B must have been diff --git a/doc/man3/X509_get0_notBefore.pod b/doc/man3/X509_get0_notBefore.pod index 82502f6588..0427d4122a 100644 --- a/doc/man3/X509_get0_notBefore.pod +++ b/doc/man3/X509_get0_notBefore.pod @@ -36,7 +36,7 @@ the call. X509_getm_notBefore() and X509_getm_notAfter() are similar to X509_get0_notBefore() and X509_get0_notAfter() except they return non-constant mutable references to the associated date field of -the certficate. +the certificate. X509_set1_notBefore() and X509_set1_notAfter() set the B and B fields of B to B. Ownership of the passed diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod index f78d02065c..c4d89a82cb 100644 --- a/doc/man3/d2i_X509.pod +++ b/doc/man3/d2i_X509.pod @@ -465,7 +465,7 @@ Represents a PKCS#1 RSA public key structure. =item B -Represents an B structure as used in IETF RFC 6960 and +Represents an B structure as used in IETF RFC 6960 and elsewhere. =item B diff --git a/doc/man5/x509v3_config.pod b/doc/man5/x509v3_config.pod index 0662326b2b..59c3e96d3d 100644 --- a/doc/man5/x509v3_config.pod +++ b/doc/man5/x509v3_config.pod @@ -350,7 +350,7 @@ Example: noticeNumbers=1,2,3,4 The B option changes the type of the I field. In RFC2459 -it can only be of type DisplayText. In RFC3280 IA5Strring is also permissible. +it can only be of type DisplayText. In RFC3280 IA5String is also permissible. Some software (for example some versions of MSIE) may require ia5org. ASN1 type of explicitText can be specified by prepending B, diff --git a/doc/man7/RSA-PSS.pod b/doc/man7/RSA-PSS.pod index 719789aec3..b608561b6d 100644 --- a/doc/man7/RSA-PSS.pod +++ b/doc/man7/RSA-PSS.pod @@ -28,7 +28,7 @@ but with some restrictions described below. =head1 SIGNING AND VERIFICATION -Siging and verification is similar to the B algorithm except the +Signing and verification is similar to the B algorithm except the padding mode is always PSS. If the key in use has parameter restrictions then the corresponding signature parameters are set to the restrictions: for example, if the key can only be used with digest SHA256, MGF1 SHA256 -- 2.25.1