summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2017-01-07 08:46:13 +0000
committerjmc <>2017-01-07 08:46:13 +0000
commitcb094ffdfb8c78ec0a740faf2c57d4a2cb6d9423 (patch)
tree3fcacff8b86f63f1791a0767a347d8f31c00ff2f
parentba862c0cbda35451bd95b10a85c4f0eba1c956f9 (diff)
downloadopenbsd-cb094ffdfb8c78ec0a740faf2c57d4a2cb6d9423.tar.gz
openbsd-cb094ffdfb8c78ec0a740faf2c57d4a2cb6d9423.tar.bz2
openbsd-cb094ffdfb8c78ec0a740faf2c57d4a2cb6d9423.zip
a little more cleanup;
-rw-r--r--src/lib/libcrypto/man/BIO_f_md.36
-rw-r--r--src/lib/libcrypto/man/X509_STORE_load_locations.314
-rw-r--r--src/lib/libcrypto/man/crypto.310
-rw-r--r--src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.312
-rw-r--r--src/lib/libcrypto/man/d2i_X509_NAME.34
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 @@
1.\" $OpenBSD: BIO_f_md.3,v 1.6 2016/12/06 14:45:08 schwarze Exp $ 1.\" $OpenBSD: BIO_f_md.3,v 1.7 2017/01/07 08:46:13 jmc Exp $
2.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400 2.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>. 4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: December 6 2016 $ 52.Dd $Mdocdate: January 7 2017 $
53.Dt BIO_F_MD 3 53.Dt BIO_F_MD 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -178,7 +178,7 @@ and
178.Fn BIO_get_md_ctx 178.Fn BIO_get_md_ctx
179return 1 for success and 0 for failure. 179return 1 for success and 0 for failure.
180.Sh EXAMPLES 180.Sh EXAMPLES
181The following example creates a BIO chain containing an SHA-1 and MD5 181The following example creates a BIO chain containing a SHA-1 and MD5
182digest BIO and passes the string "Hello World" through it. 182digest BIO and passes the string "Hello World" through it.
183Error checking has been omitted for clarity. 183Error checking has been omitted for clarity.
184.Bd -literal -offset 2n 184.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 @@
1.\" $OpenBSD: X509_STORE_load_locations.3,v 1.1 2017/01/07 00:45:04 schwarze Exp $ 1.\" $OpenBSD: X509_STORE_load_locations.3,v 1.2 2017/01/07 08:46:13 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -64,8 +64,9 @@ See that manual page for more information.
64.Fn X509_STORE_set_default_paths 64.Fn X509_STORE_set_default_paths
65is similar except that it instructs the 65is similar except that it instructs the
66.Fa store 66.Fa store
67to use the default PEM file and directory, see 67to use the default PEM file and directory
68.Sx FILES , 68(as documented in
69.Sx FILES )
69in addition to what is already configured. 70in addition to what is already configured.
70It ignores errors that occur while trying to load the file or to 71It ignores errors that occur while trying to load the file or to
71add the directory, but it may still fail for other reasons, for 72add the directory, but it may still fail for other reasons, for
@@ -107,10 +108,9 @@ default directory for
107.Xr X509_STORE_set1_param 3 , 108.Xr X509_STORE_set1_param 3 ,
108.Xr X509_STORE_set_verify_cb 3 109.Xr X509_STORE_set_verify_cb 3
109.Sh BUGS 110.Sh BUGS
110By the time adding a directory is found to fail, the file and some 111By the time that adding a directory is found to have failed,
111other directories may already have been successfully loaded, so 112the file and some other directories may already have been successfully loaded,
112these functions may change the state of the store even when they 113so these functions may change the state of the store even when they fail.
113fail.
114.Pp 114.Pp
115.Fn X509_STORE_set_default_paths 115.Fn X509_STORE_set_default_paths
116clears the error queue, deleting even error information that was 116clears 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 @@
1.\" $OpenBSD: crypto.3,v 1.15 2016/12/22 14:44:48 jmc Exp $ 1.\" $OpenBSD: crypto.3,v 1.16 2017/01/07 08:46:13 jmc Exp $
2.\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100 2.\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
3.\" 3.\"
4.\" This file was written by Ulf Moeller <ulf@openssl.org> and 4.\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: December 22 2016 $ 52.Dd $Mdocdate: January 7 2017 $
53.Dt CRYPTO 3 53.Dt CRYPTO 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -111,13 +111,13 @@ and
111.Sy Auxiliary features include: 111.Sy Auxiliary features include:
112.Bl -dash -compact 112.Bl -dash -compact
113.It 113.It
114configuration file handling, see 114configuration file handling: see
115.Xr OPENSSL_config 3 115.Xr OPENSSL_config 3
116.It 116.It
117error reporting, see 117error reporting: see
118.Xr ERR 3 118.Xr ERR 3
119.It 119.It
120thread support, see 120thread support: see
121.Xr CRYPTO_set_locking_callback 3 121.Xr CRYPTO_set_locking_callback 3
122.It 122.It
123.Xr OCSP_REQUEST_new 3 123.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 @@
1.\" $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.3 2017/01/06 00:27:42 jmc Exp $ 1.\" $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.4 2017/01/07 08:46:13 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -14,7 +14,7 @@
14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16.\" 16.\"
17.Dd $Mdocdate: January 6 2017 $ 17.Dd $Mdocdate: January 7 2017 $
18.Dt D2I_ASN1_OCTET_STRING 3 18.Dt D2I_ASN1_OCTET_STRING 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -301,7 +301,7 @@ decode and encode an ASN.1
301structure defined in RFC 5280 section 4.1.2.4 301structure defined in RFC 5280 section 4.1.2.4
302and used for ASN.1 302and used for ASN.1
303.Vt EDIPartyName 303.Vt EDIPartyName
304structures, see 304structures; see
305.Xr EDIPARTYNAME_new 3 . 305.Xr EDIPARTYNAME_new 3 .
306When decoding, it accepts any of the types UTF8String, UniversalString, 306When decoding, it accepts any of the types UTF8String, UniversalString,
307BMPString, T61String, or PrintableString. 307BMPString, T61String, or PrintableString.
@@ -347,9 +347,9 @@ decode and encode an ASN.1
347structure defined in RFC 5280 section 4.1 347structure defined in RFC 5280 section 4.1
348and used for ASN.1 348and used for ASN.1
349.Vt Validity 349.Vt Validity
350structures in certificates, see 350structures in certificates; see
351.Xr X509_VAL_new 3 , 351.Xr X509_VAL_new 3 .
352and also used for certificate revocation lists, see 352They are also used for certificate revocation lists; see
353.Xr X509_CRL_INFO_new 3 . 353.Xr X509_CRL_INFO_new 3 .
354When decoding, it accepts either GeneralizedTime or UTCTime. 354When decoding, it accepts either GeneralizedTime or UTCTime.
355When encoding, it writes out the time type that is actually passed in. 355When 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 @@
1.\" $OpenBSD: d2i_X509_NAME.3,v 1.9 2017/01/07 01:25:14 schwarze Exp $ 1.\" $OpenBSD: d2i_X509_NAME.3,v 1.10 2017/01/07 08:46:13 jmc Exp $
2.\" OpenSSL d900a015 Oct 8 14:40:42 2015 +0200 2.\" OpenSSL d900a015 Oct 8 14:40:42 2015 +0200
3.\" 3.\"
4.\" Copyright (c) 2016, 2017 Ingo Schwarze <schwarze@openbsd.org> 4.\" Copyright (c) 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -89,7 +89,7 @@ and
89.Fn d2i_X509_NAME . 89.Fn d2i_X509_NAME .
90.Pp 90.Pp
91.Fn X509_NAME_hash 91.Fn X509_NAME_hash
92calculates an 92calculates a
93.Xr SHA1 3 93.Xr SHA1 3
94hash of the DER-encoded form of the name 94hash of the DER-encoded form of the name
95.Pf * Fa val_in . 95.Pf * Fa val_in .