diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2017-10-08 06:56:37 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2017-10-08 06:56:37 +0000 |
| commit | 0f071b8e22e8a2cb78100de99e5896cdc3b5e691 (patch) | |
| tree | ac27567d26f91202f0b76022ac93fd44a18872ac | |
| parent | cf1ba3ae91791db8f1114cd56527df0ba814b883 (diff) | |
hyphenate DER/PEM-encoded, for consistency;
| -rw-r--r-- | lib/libtls/man/tls_conn_version.3 | 6 | ||||
| -rw-r--r-- | lib/libtls/man/tls_load_file.3 | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/libtls/man/tls_conn_version.3 b/lib/libtls/man/tls_conn_version.3 index e65e69b16d0..f8a1678e8ca 100644 --- a/lib/libtls/man/tls_conn_version.3 +++ b/lib/libtls/man/tls_conn_version.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tls_conn_version.3,v 1.5 2017/10/07 14:41:58 jsing Exp $ +.\" $OpenBSD: tls_conn_version.3,v 1.6 2017/10/08 06:56:36 jmc Exp $ .\" .\" Copyright (c) 2015 Bob Beck <beck@openbsd.org> .\" Copyright (c) 2016 Joel Sing <jsing@openbsd.org> @@ -15,7 +15,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: October 7 2017 $ +.Dd $Mdocdate: October 8 2017 $ .Dt TLS_CONN_VERSION 3 .Os .Sh NAME @@ -103,7 +103,7 @@ SAN or CN that matches .Ar name . .Pp .Fn tls_peer_cert_chain_pem -returns a pointer to memory containing a PEM encoded certificate chain for the +returns a pointer to memory containing a PEM-encoded certificate chain for the peer certificate from .Ar ctx . .Pp diff --git a/lib/libtls/man/tls_load_file.3 b/lib/libtls/man/tls_load_file.3 index 957e65503e2..d4870097568 100644 --- a/lib/libtls/man/tls_load_file.3 +++ b/lib/libtls/man/tls_load_file.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tls_load_file.3,v 1.8 2017/08/01 08:41:36 jmc Exp $ +.\" $OpenBSD: tls_load_file.3,v 1.9 2017/10/08 06:56:36 jmc Exp $ .\" .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> .\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -17,7 +17,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: August 1 2017 $ +.Dd $Mdocdate: October 8 2017 $ .Dt TLS_LOAD_FILE 3 .Os .Sh NAME @@ -255,11 +255,11 @@ sets the files from which the public certificate, and private key will be read. directly sets the public certificate, and private key from memory. .Pp .Fn tls_config_set_keypair_ocsp_file -sets the files from which the public certificate, private key, and DER encoded +sets the files from which the public certificate, private key, and DER-encoded OCSP staple will be read. .Pp .Fn tls_config_set_keypair_ocsp_mem -directly sets the public certificate, private key, and DER encoded OCSP staple +directly sets the public certificate, private key, and DER-encoded OCSP staple from memory. .Pp .Fn tls_config_add_keypair_file @@ -271,12 +271,12 @@ adds an additional public certificate, and private key from memory, used as an alternative certificate for Server Name Indication (server only). .Pp .Fn tls_config_add_keypair_ocsp_file -adds an additional public certificate, private key, and DER encoded OCSP staple +adds an additional public certificate, private key, and DER-encoded OCSP staple from the specified files, used as an alternative certificate for Server Name Indication (server only). .Pp .Fn tls_config_add_keypair_ocsp_mem -adds an additional public certificate, private key, and DER encoded OCSP staple +adds an additional public certificate, private key, and DER-encoded OCSP staple from memory, used as an alternative certificate for Server Name Indication (server only). .Pp |