diff options
author | reyk <> | 2015-01-22 09:16:24 +0000 |
---|---|---|
committer | reyk <> | 2015-01-22 09:16:24 +0000 |
commit | 138944aeef27fb00df60db6f46ef653726b4ca5a (patch) | |
tree | 0cd70582ac032f525e31a6921611469898b556c3 /src/lib/libtls/tls_init.3 | |
parent | d0ef2b563d4291f81a8f9ed7cd02bdfbaa8cc5f4 (diff) | |
download | openbsd-138944aeef27fb00df60db6f46ef653726b4ca5a.tar.gz openbsd-138944aeef27fb00df60db6f46ef653726b4ca5a.tar.bz2 openbsd-138944aeef27fb00df60db6f46ef653726b4ca5a.zip |
Allow to to load the CA chain directly from memory instead of
specifying a file. This enables CA verification in privsep'ed
processes that are running chroot'ed without direct access to the
certificate files.
With feedback, tests, and OK from bluhm@
Diffstat (limited to 'src/lib/libtls/tls_init.3')
-rw-r--r-- | src/lib/libtls/tls_init.3 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_init.3 b/src/lib/libtls/tls_init.3 index e870078225..df2dfc8a41 100644 --- a/src/lib/libtls/tls_init.3 +++ b/src/lib/libtls/tls_init.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: tls_init.3,v 1.6 2015/01/01 13:30:52 schwarze Exp $ | 1 | .\" $OpenBSD: tls_init.3,v 1.7 2015/01/22 09:16:24 reyk Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> | 3 | .\" Copyright (c) 2014 Ted Unangst <tedu@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 1 2015 $ | 17 | .Dd $Mdocdate: January 22 2015 $ |
18 | .Dt TLS 3 | 18 | .Dt TLS 3 |
19 | .Os | 19 | .Os |
20 | .Sh NAME | 20 | .Sh NAME |
@@ -24,6 +24,7 @@ | |||
24 | .Nm tls_config_free , | 24 | .Nm tls_config_free , |
25 | .Nm tls_config_set_ca_file , | 25 | .Nm tls_config_set_ca_file , |
26 | .Nm tls_config_set_ca_path , | 26 | .Nm tls_config_set_ca_path , |
27 | .Nm tls_config_set_ca_mem , | ||
27 | .Nm tls_config_set_cert_file , | 28 | .Nm tls_config_set_cert_file , |
28 | .Nm tls_config_set_cert_mem , | 29 | .Nm tls_config_set_cert_mem , |
29 | .Nm tls_config_set_ciphers , | 30 | .Nm tls_config_set_ciphers , |
@@ -63,6 +64,8 @@ | |||
63 | .Ft "int" | 64 | .Ft "int" |
64 | .Fn tls_config_set_ca_path "struct tls_config *config" "const char *ca_path" | 65 | .Fn tls_config_set_ca_path "struct tls_config *config" "const char *ca_path" |
65 | .Ft "int" | 66 | .Ft "int" |
67 | .Fn tls_config_set_ca_mem "struct tls_config *config" "const uint8_t *cert" "size_t len" | ||
68 | .Ft "int" | ||
66 | .Fn tls_config_set_cert_file "struct tls_config *config" "const char *cert_file" | 69 | .Fn tls_config_set_cert_file "struct tls_config *config" "const char *cert_file" |
67 | .Ft "int" | 70 | .Ft "int" |
68 | .Fn tls_config_set_cert_mem "struct tls_config *config" "const uint8_t *cert" "size_t len" | 71 | .Fn tls_config_set_cert_mem "struct tls_config *config" "const uint8_t *cert" "size_t len" |
@@ -198,6 +201,10 @@ sets the path (directory) which should be searched for root | |||
198 | certificates. | 201 | certificates. |
199 | .Em (Client) | 202 | .Em (Client) |
200 | .It | 203 | .It |
204 | .Fn tls_config_set_ca_mem | ||
205 | sets the root certificates directly from memory. | ||
206 | .Em (Client) | ||
207 | .It | ||
201 | .Fn tls_config_set_cert_file | 208 | .Fn tls_config_set_cert_file |
202 | sets file from which the public certificate will be read. | 209 | sets file from which the public certificate will be read. |
203 | .Em (Client and server) | 210 | .Em (Client and server) |