summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2017-10-08 06:56:36 +0000
committerjmc <>2017-10-08 06:56:36 +0000
commita5b4d2c04b558a0cdaf1eaacb3f83fcc27e23de7 (patch)
tree10c99c27a8bc0be3627dce02b96f63ad9bf2d47d
parent28567f4e25fa1cdcf7053c3f9b2a6fc0fd707a37 (diff)
downloadopenbsd-a5b4d2c04b558a0cdaf1eaacb3f83fcc27e23de7.tar.gz
openbsd-a5b4d2c04b558a0cdaf1eaacb3f83fcc27e23de7.tar.bz2
openbsd-a5b4d2c04b558a0cdaf1eaacb3f83fcc27e23de7.zip
hyphenate DER/PEM-encoded, for consistency;
-rw-r--r--src/lib/libtls/man/tls_conn_version.36
-rw-r--r--src/lib/libtls/man/tls_load_file.312
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libtls/man/tls_conn_version.3 b/src/lib/libtls/man/tls_conn_version.3
index e65e69b16d..f8a1678e8c 100644
--- a/src/lib/libtls/man/tls_conn_version.3
+++ b/src/lib/libtls/man/tls_conn_version.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: tls_conn_version.3,v 1.5 2017/10/07 14:41:58 jsing Exp $ 1.\" $OpenBSD: tls_conn_version.3,v 1.6 2017/10/08 06:56:36 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2015 Bob Beck <beck@openbsd.org> 3.\" Copyright (c) 2015 Bob Beck <beck@openbsd.org>
4.\" Copyright (c) 2016 Joel Sing <jsing@openbsd.org> 4.\" Copyright (c) 2016 Joel Sing <jsing@openbsd.org>
@@ -15,7 +15,7 @@
15.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 15.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17.\" 17.\"
18.Dd $Mdocdate: October 7 2017 $ 18.Dd $Mdocdate: October 8 2017 $
19.Dt TLS_CONN_VERSION 3 19.Dt TLS_CONN_VERSION 3
20.Os 20.Os
21.Sh NAME 21.Sh NAME
@@ -103,7 +103,7 @@ SAN or CN that matches
103.Ar name . 103.Ar name .
104.Pp 104.Pp
105.Fn tls_peer_cert_chain_pem 105.Fn tls_peer_cert_chain_pem
106returns a pointer to memory containing a PEM encoded certificate chain for the 106returns a pointer to memory containing a PEM-encoded certificate chain for the
107peer certificate from 107peer certificate from
108.Ar ctx . 108.Ar ctx .
109.Pp 109.Pp
diff --git a/src/lib/libtls/man/tls_load_file.3 b/src/lib/libtls/man/tls_load_file.3
index 957e65503e..d487009756 100644
--- a/src/lib/libtls/man/tls_load_file.3
+++ b/src/lib/libtls/man/tls_load_file.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: tls_load_file.3,v 1.8 2017/08/01 08:41:36 jmc Exp $ 1.\" $OpenBSD: tls_load_file.3,v 1.9 2017/10/08 06:56:36 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> 3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
4.\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> 4.\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,7 @@
17.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19.\" 19.\"
20.Dd $Mdocdate: August 1 2017 $ 20.Dd $Mdocdate: October 8 2017 $
21.Dt TLS_LOAD_FILE 3 21.Dt TLS_LOAD_FILE 3
22.Os 22.Os
23.Sh NAME 23.Sh NAME
@@ -255,11 +255,11 @@ sets the files from which the public certificate, and private key will be read.
255directly sets the public certificate, and private key from memory. 255directly sets the public certificate, and private key from memory.
256.Pp 256.Pp
257.Fn tls_config_set_keypair_ocsp_file 257.Fn tls_config_set_keypair_ocsp_file
258sets the files from which the public certificate, private key, and DER encoded 258sets the files from which the public certificate, private key, and DER-encoded
259OCSP staple will be read. 259OCSP staple will be read.
260.Pp 260.Pp
261.Fn tls_config_set_keypair_ocsp_mem 261.Fn tls_config_set_keypair_ocsp_mem
262directly sets the public certificate, private key, and DER encoded OCSP staple 262directly sets the public certificate, private key, and DER-encoded OCSP staple
263from memory. 263from memory.
264.Pp 264.Pp
265.Fn tls_config_add_keypair_file 265.Fn tls_config_add_keypair_file
@@ -271,12 +271,12 @@ adds an additional public certificate, and private key from memory, used as an
271alternative certificate for Server Name Indication (server only). 271alternative certificate for Server Name Indication (server only).
272.Pp 272.Pp
273.Fn tls_config_add_keypair_ocsp_file 273.Fn tls_config_add_keypair_ocsp_file
274adds an additional public certificate, private key, and DER encoded OCSP staple 274adds an additional public certificate, private key, and DER-encoded OCSP staple
275from the specified files, used as an alternative certificate for Server Name 275from the specified files, used as an alternative certificate for Server Name
276Indication (server only). 276Indication (server only).
277.Pp 277.Pp
278.Fn tls_config_add_keypair_ocsp_mem 278.Fn tls_config_add_keypair_ocsp_mem
279adds an additional public certificate, private key, and DER encoded OCSP staple 279adds an additional public certificate, private key, and DER-encoded OCSP staple
280from memory, used as an alternative certificate for Server Name Indication 280from memory, used as an alternative certificate for Server Name Indication
281(server only). 281(server only).
282.Pp 282.Pp