From cb094ffdfb8c78ec0a740faf2c57d4a2cb6d9423 Mon Sep 17 00:00:00 2001 From: jmc <> Date: Sat, 7 Jan 2017 08:46:13 +0000 Subject: a little more cleanup; --- src/lib/libcrypto/man/BIO_f_md.3 | 6 +++--- src/lib/libcrypto/man/X509_STORE_load_locations.3 | 14 +++++++------- src/lib/libcrypto/man/crypto.3 | 10 +++++----- src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 | 12 ++++++------ src/lib/libcrypto/man/d2i_X509_NAME.3 | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/lib/libcrypto/man/BIO_f_md.3 b/src/lib/libcrypto/man/BIO_f_md.3 index d2c08daf7e..e522381862 100644 --- a/src/lib/libcrypto/man/BIO_f_md.3 +++ b/src/lib/libcrypto/man/BIO_f_md.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: BIO_f_md.3,v 1.6 2016/12/06 14:45:08 schwarze Exp $ +.\" $OpenBSD: BIO_f_md.3,v 1.7 2017/01/07 08:46:13 jmc Exp $ .\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 6 2016 $ +.Dd $Mdocdate: January 7 2017 $ .Dt BIO_F_MD 3 .Os .Sh NAME @@ -178,7 +178,7 @@ and .Fn BIO_get_md_ctx return 1 for success and 0 for failure. .Sh EXAMPLES -The following example creates a BIO chain containing an SHA-1 and MD5 +The following example creates a BIO chain containing a SHA-1 and MD5 digest BIO and passes the string "Hello World" through it. Error checking has been omitted for clarity. .Bd -literal -offset 2n diff --git a/src/lib/libcrypto/man/X509_STORE_load_locations.3 b/src/lib/libcrypto/man/X509_STORE_load_locations.3 index fa24044a36..8f1f41feac 100644 --- a/src/lib/libcrypto/man/X509_STORE_load_locations.3 +++ b/src/lib/libcrypto/man/X509_STORE_load_locations.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: X509_STORE_load_locations.3,v 1.1 2017/01/07 00:45:04 schwarze Exp $ +.\" $OpenBSD: X509_STORE_load_locations.3,v 1.2 2017/01/07 08:46:13 jmc Exp $ .\" .\" Copyright (c) 2017 Ingo Schwarze .\" @@ -64,8 +64,9 @@ See that manual page for more information. .Fn X509_STORE_set_default_paths is similar except that it instructs the .Fa store -to use the default PEM file and directory, see -.Sx FILES , +to use the default PEM file and directory +(as documented in +.Sx FILES ) in addition to what is already configured. It ignores errors that occur while trying to load the file or to add the directory, but it may still fail for other reasons, for @@ -107,10 +108,9 @@ default directory for .Xr X509_STORE_set1_param 3 , .Xr X509_STORE_set_verify_cb 3 .Sh BUGS -By the time adding a directory is found to fail, the file and some -other directories may already have been successfully loaded, so -these functions may change the state of the store even when they -fail. +By the time that adding a directory is found to have failed, +the file and some other directories may already have been successfully loaded, +so these functions may change the state of the store even when they fail. .Pp .Fn X509_STORE_set_default_paths clears the error queue, deleting even error information that was diff --git a/src/lib/libcrypto/man/crypto.3 b/src/lib/libcrypto/man/crypto.3 index 06081cfdb3..2bba237ad6 100644 --- a/src/lib/libcrypto/man/crypto.3 +++ b/src/lib/libcrypto/man/crypto.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: crypto.3,v 1.15 2016/12/22 14:44:48 jmc Exp $ +.\" $OpenBSD: crypto.3,v 1.16 2017/01/07 08:46:13 jmc Exp $ .\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100 .\" .\" This file was written by Ulf Moeller and @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 22 2016 $ +.Dd $Mdocdate: January 7 2017 $ .Dt CRYPTO 3 .Os .Sh NAME @@ -111,13 +111,13 @@ and .Sy Auxiliary features include: .Bl -dash -compact .It -configuration file handling, see +configuration file handling: see .Xr OPENSSL_config 3 .It -error reporting, see +error reporting: see .Xr ERR 3 .It -thread support, see +thread support: see .Xr CRYPTO_set_locking_callback 3 .It .Xr OCSP_REQUEST_new 3 diff --git a/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 b/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 index c4ced53ed2..d3a8ffea02 100644 --- a/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 +++ b/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.3 2017/01/06 00:27:42 jmc Exp $ +.\" $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.4 2017/01/07 08:46:13 jmc Exp $ .\" .\" Copyright (c) 2017 Ingo Schwarze .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 6 2017 $ +.Dd $Mdocdate: January 7 2017 $ .Dt D2I_ASN1_OCTET_STRING 3 .Os .Sh NAME @@ -301,7 +301,7 @@ decode and encode an ASN.1 structure defined in RFC 5280 section 4.1.2.4 and used for ASN.1 .Vt EDIPartyName -structures, see +structures; see .Xr EDIPARTYNAME_new 3 . When decoding, it accepts any of the types UTF8String, UniversalString, BMPString, T61String, or PrintableString. @@ -347,9 +347,9 @@ decode and encode an ASN.1 structure defined in RFC 5280 section 4.1 and used for ASN.1 .Vt Validity -structures in certificates, see -.Xr X509_VAL_new 3 , -and also used for certificate revocation lists, see +structures in certificates; see +.Xr X509_VAL_new 3 . +They are also used for certificate revocation lists; see .Xr X509_CRL_INFO_new 3 . When decoding, it accepts either GeneralizedTime or UTCTime. When encoding, it writes out the time type that is actually passed in. diff --git a/src/lib/libcrypto/man/d2i_X509_NAME.3 b/src/lib/libcrypto/man/d2i_X509_NAME.3 index 3bca5c9bff..3dd337c430 100644 --- a/src/lib/libcrypto/man/d2i_X509_NAME.3 +++ b/src/lib/libcrypto/man/d2i_X509_NAME.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_NAME.3,v 1.9 2017/01/07 01:25:14 schwarze Exp $ +.\" $OpenBSD: d2i_X509_NAME.3,v 1.10 2017/01/07 08:46:13 jmc Exp $ .\" OpenSSL d900a015 Oct 8 14:40:42 2015 +0200 .\" .\" Copyright (c) 2016, 2017 Ingo Schwarze @@ -89,7 +89,7 @@ and .Fn d2i_X509_NAME . .Pp .Fn X509_NAME_hash -calculates an +calculates a .Xr SHA1 3 hash of the DER-encoded form of the name .Pf * Fa val_in . -- cgit v1.2.3-55-g6feb