diff options
| author | jmc <> | 2017-10-08 06:56:36 +0000 |
|---|---|---|
| committer | jmc <> | 2017-10-08 06:56:36 +0000 |
| commit | 7819e9da1462ce9c60996aaf73ca0c06f0a2424b (patch) | |
| tree | 10c99c27a8bc0be3627dce02b96f63ad9bf2d47d /src | |
| parent | 6b08495f8f1244a236e4e29a757124f88c02d57b (diff) | |
| download | openbsd-7819e9da1462ce9c60996aaf73ca0c06f0a2424b.tar.gz openbsd-7819e9da1462ce9c60996aaf73ca0c06f0a2424b.tar.bz2 openbsd-7819e9da1462ce9c60996aaf73ca0c06f0a2424b.zip | |
hyphenate DER/PEM-encoded, for consistency;
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/man/tls_conn_version.3 | 6 | ||||
| -rw-r--r-- | src/lib/libtls/man/tls_load_file.3 | 12 |
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 |
| 106 | returns a pointer to memory containing a PEM encoded certificate chain for the | 106 | returns a pointer to memory containing a PEM-encoded certificate chain for the |
| 107 | peer certificate from | 107 | peer 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. | |||
| 255 | directly sets the public certificate, and private key from memory. | 255 | directly 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 |
| 258 | sets the files from which the public certificate, private key, and DER encoded | 258 | sets the files from which the public certificate, private key, and DER-encoded |
| 259 | OCSP staple will be read. | 259 | OCSP staple will be read. |
| 260 | .Pp | 260 | .Pp |
| 261 | .Fn tls_config_set_keypair_ocsp_mem | 261 | .Fn tls_config_set_keypair_ocsp_mem |
| 262 | directly sets the public certificate, private key, and DER encoded OCSP staple | 262 | directly sets the public certificate, private key, and DER-encoded OCSP staple |
| 263 | from memory. | 263 | from 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 | |||
| 271 | alternative certificate for Server Name Indication (server only). | 271 | alternative 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 |
| 274 | adds an additional public certificate, private key, and DER encoded OCSP staple | 274 | adds an additional public certificate, private key, and DER-encoded OCSP staple |
| 275 | from the specified files, used as an alternative certificate for Server Name | 275 | from the specified files, used as an alternative certificate for Server Name |
| 276 | Indication (server only). | 276 | Indication (server only). |
| 277 | .Pp | 277 | .Pp |
| 278 | .Fn tls_config_add_keypair_ocsp_mem | 278 | .Fn tls_config_add_keypair_ocsp_mem |
| 279 | adds an additional public certificate, private key, and DER encoded OCSP staple | 279 | adds an additional public certificate, private key, and DER-encoded OCSP staple |
| 280 | from memory, used as an alternative certificate for Server Name Indication | 280 | from memory, used as an alternative certificate for Server Name Indication |
| 281 | (server only). | 281 | (server only). |
| 282 | .Pp | 282 | .Pp |
