summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libtls/tls_init.318
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libtls/tls_init.3 b/src/lib/libtls/tls_init.3
index f5b323a9ba..b2261a7c66 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.82 2017/01/24 00:00:12 claudio Exp $ 1.\" $OpenBSD: tls_init.3,v 1.83 2017/01/24 00:28:31 claudio Exp $
2.\" 2.\"
3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> 3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
4.\" 4.\"
@@ -371,14 +371,6 @@ used as an alternative certificate for Server Name Indication (server only).
371adds an additional public certificate and private key from memory, 371adds an additional public certificate and private key from memory,
372used as an alternative certificate for Server Name Indication (server only). 372used as an alternative certificate for Server Name Indication (server only).
373.It 373.It
374.Fn tls_config_set_ocsp_staple_mem
375sets a DER-encoded OCSP response to be stapled during the TLS handshake from
376memory.
377.It
378.Fn tls_config_set_ocsp_staple_file
379sets a DER-encoded OCSP response to be stapled during the TLS handshake from
380the specified file.
381.It
382.Fn tls_config_set_alpn 374.Fn tls_config_set_alpn
383sets the ALPN protocols that are supported. 375sets the ALPN protocols that are supported.
384The alpn string is a comma separated list of protocols, in order of preference. 376The alpn string is a comma separated list of protocols, in order of preference.
@@ -429,6 +421,14 @@ sets the files from which the public certificate and private key will be read.
429.Fn tls_config_set_keypair_mem 421.Fn tls_config_set_keypair_mem
430directly sets the public certificate and private key from memory. 422directly sets the public certificate and private key from memory.
431.It 423.It
424.Fn tls_config_set_ocsp_staple_file
425sets a DER-encoded OCSP response to be stapled during the TLS handshake from
426the specified file.
427.It
428.Fn tls_config_set_ocsp_staple_mem
429sets a DER-encoded OCSP response to be stapled during the TLS handshake from
430memory.
431.It
432.Fn tls_config_set_protocols 432.Fn tls_config_set_protocols
433sets which versions of the protocol may be used. 433sets which versions of the protocol may be used.
434Possible values are the bitwise OR of: 434Possible values are the bitwise OR of: