diff options
author | jsing <> | 2017-07-06 17:27:19 +0000 |
---|---|---|
committer | jsing <> | 2017-07-06 17:27:19 +0000 |
commit | 9b91fb97f1ba8f97f4670fc409407c82a94c71a2 (patch) | |
tree | 9f3da0265b88188fdd55d0203a79471ed403b46e | |
parent | bd58d5266096a4b287667e2b80c4e8e7012521d0 (diff) | |
download | openbsd-9b91fb97f1ba8f97f4670fc409407c82a94c71a2.tar.gz openbsd-9b91fb97f1ba8f97f4670fc409407c82a94c71a2.tar.bz2 openbsd-9b91fb97f1ba8f97f4670fc409407c82a94c71a2.zip |
Document tls_config_set_crl_file() and tls_config_set_crl_mem().
Based on a diff from Jack Burton <jack at saosce dot com dot au>, thanks!
-rw-r--r-- | src/lib/libtls/man/tls_load_file.3 | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/src/lib/libtls/man/tls_load_file.3 b/src/lib/libtls/man/tls_load_file.3 index ea3a3feed5..fcaa5eef02 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.6 2017/05/06 21:06:19 jsing Exp $ | 1 | .\" $OpenBSD: tls_load_file.3,v 1.7 2017/07/06 17:27:19 jsing 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: May 6 2017 $ | 20 | .Dd $Mdocdate: July 6 2017 $ |
21 | .Dt TLS_LOAD_FILE 3 | 21 | .Dt TLS_LOAD_FILE 3 |
22 | .Os | 22 | .Os |
23 | .Sh NAME | 23 | .Sh NAME |
@@ -28,6 +28,8 @@ | |||
28 | .Nm tls_config_set_ca_mem , | 28 | .Nm tls_config_set_ca_mem , |
29 | .Nm tls_config_set_cert_file , | 29 | .Nm tls_config_set_cert_file , |
30 | .Nm tls_config_set_cert_mem , | 30 | .Nm tls_config_set_cert_mem , |
31 | .Nm tls_config_set_crl_file , | ||
32 | .Nm tls_config_set_crl_mem , | ||
31 | .Nm tls_config_set_key_file , | 33 | .Nm tls_config_set_key_file , |
32 | .Nm tls_config_set_key_mem , | 34 | .Nm tls_config_set_key_mem , |
33 | .Nm tls_config_set_ocsp_staple_mem , | 35 | .Nm tls_config_set_ocsp_staple_mem , |
@@ -86,6 +88,17 @@ | |||
86 | .Fa "size_t len" | 88 | .Fa "size_t len" |
87 | .Fc | 89 | .Fc |
88 | .Ft int | 90 | .Ft int |
91 | .Fo tls_config_set_crl_file | ||
92 | .Fa "struct tls_config *config" | ||
93 | .Fa "const char *crl_file" | ||
94 | .Fc | ||
95 | .Ft int | ||
96 | .Fo tls_config_set_crl_mem | ||
97 | .Fa "struct tls_config *config" | ||
98 | .Fa "const uint8_t *crl" | ||
99 | .Fa "size_t len" | ||
100 | .Fc | ||
101 | .Ft int | ||
89 | .Fo tls_config_set_key_file | 102 | .Fo tls_config_set_key_file |
90 | .Fa "struct tls_config *config" | 103 | .Fa "struct tls_config *config" |
91 | .Fa "const char *key_file" | 104 | .Fa "const char *key_file" |
@@ -184,7 +197,8 @@ | |||
184 | .Fn tls_load_file | 197 | .Fn tls_load_file |
185 | loads a certificate or key from disk into memory to be used with | 198 | loads a certificate or key from disk into memory to be used with |
186 | .Fn tls_config_set_ca_mem , | 199 | .Fn tls_config_set_ca_mem , |
187 | .Fn tls_config_set_cert_mem | 200 | .Fn tls_config_set_cert_mem , |
201 | .Fn tls_config_set_crl_mem | ||
188 | or | 202 | or |
189 | .Fn tls_config_set_key_mem . | 203 | .Fn tls_config_set_key_mem . |
190 | A private key will be decrypted if the optional | 204 | A private key will be decrypted if the optional |
@@ -213,6 +227,13 @@ sets file from which the public certificate will be read. | |||
213 | .Fn tls_config_set_cert_mem | 227 | .Fn tls_config_set_cert_mem |
214 | sets the public certificate directly from memory. | 228 | sets the public certificate directly from memory. |
215 | .Pp | 229 | .Pp |
230 | .Fn tls_config_set_crl_file | ||
231 | sets the filename used to load a file containing the | ||
232 | Certificate Revocation List (CRL). | ||
233 | .Pp | ||
234 | .Fn tls_config_set_crl_mem | ||
235 | sets the CRL directly from memory. | ||
236 | .Pp | ||
216 | .Fn tls_config_set_key_file | 237 | .Fn tls_config_set_key_file |
217 | sets the file from which the private key will be read. | 238 | sets the file from which the private key will be read. |
218 | .Pp | 239 | .Pp |
@@ -324,6 +345,12 @@ and | |||
324 | .Fn tls_config_add_keypair_mem | 345 | .Fn tls_config_add_keypair_mem |
325 | in | 346 | in |
326 | .Ox 6.1 . | 347 | .Ox 6.1 . |
348 | .Pp | ||
349 | .Fn tls_config_set_crl_file | ||
350 | and | ||
351 | .Fn tls_config_set_crl_mem | ||
352 | appeared in | ||
353 | .Ox 6.2 . | ||
327 | .Sh AUTHORS | 354 | .Sh AUTHORS |
328 | .An Joel Sing Aq Mt jsing@openbsd.org | 355 | .An Joel Sing Aq Mt jsing@openbsd.org |
329 | with contibutions from | 356 | with contibutions from |