summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2017-01-24 00:00:13 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2017-01-24 00:00:13 +0000
commit04b23cb1dad0684937334e4930930d3c13629ea4 (patch)
tree824e03ae07b48b053255da18750b983fd6287680 /lib
parent5955d2e875e79f61361b66d8fd45d2c3ef1b8084 (diff)
tls_config_add_keypair_mem is the function to add additional keypairs and
ocsp_staple functions set the OCSP response they don't add them (which implies you can call them multiple times). Discussed with jsing@ beck@
Diffstat (limited to 'lib')
-rw-r--r--lib/libtls/tls_init.310
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libtls/tls_init.3 b/lib/libtls/tls_init.3
index 4e8c4a66278..f5b323a9ba7 100644
--- a/lib/libtls/tls_init.3
+++ b/lib/libtls/tls_init.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tls_init.3,v 1.81 2016/11/11 14:02:24 jsing Exp $
+.\" $OpenBSD: tls_init.3,v 1.82 2017/01/24 00:00:12 claudio Exp $
.\"
.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
.\"
@@ -14,7 +14,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: November 11 2016 $
+.Dd $Mdocdate: January 24 2017 $
.Dt TLS_INIT 3
.Os
.Sh NAME
@@ -367,16 +367,16 @@ otherwise):
adds an additional public certificate and private key from the specified files,
used as an alternative certificate for Server Name Indication (server only).
.It
-.Fn tls_config_set_keypair_mem
+.Fn tls_config_add_keypair_mem
adds an additional public certificate and private key from memory,
used as an alternative certificate for Server Name Indication (server only).
.It
.Fn tls_config_set_ocsp_staple_mem
-adds a DER-encoded OCSP response to be stapled during the TLS handshake from
+sets a DER-encoded OCSP response to be stapled during the TLS handshake from
memory.
.It
.Fn tls_config_set_ocsp_staple_file
-adds a DER-encoded OCSP response to be stapled during the TLS handshake from
+sets a DER-encoded OCSP response to be stapled during the TLS handshake from
the specified file.
.It
.Fn tls_config_set_alpn