summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2017-01-24 00:28:32 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2017-01-24 00:28:32 +0000
commit322d2a2ff8a8ae896867f148d13ac2a10aa3cd46 (patch)
treedaf43e5e41b4d9b2e48878b886afa1be29ff1bfd
parent3b09ae3d0969eea452edbb55f26fc00c6b41637c (diff)
Shuffle the deck chairs to bring them back in order.
-rw-r--r--lib/libtls/tls_init.318
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libtls/tls_init.3 b/lib/libtls/tls_init.3
index f5b323a9ba7..b2261a7c662 100644
--- a/lib/libtls/tls_init.3
+++ b/lib/libtls/tls_init.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tls_init.3,v 1.82 2017/01/24 00:00:12 claudio Exp $
+.\" $OpenBSD: tls_init.3,v 1.83 2017/01/24 00:28:31 claudio Exp $
.\"
.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
.\"
@@ -371,14 +371,6 @@ used as an alternative certificate for Server Name Indication (server only).
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
-sets a DER-encoded OCSP response to be stapled during the TLS handshake from
-memory.
-.It
-.Fn tls_config_set_ocsp_staple_file
-sets a DER-encoded OCSP response to be stapled during the TLS handshake from
-the specified file.
-.It
.Fn tls_config_set_alpn
sets the ALPN protocols that are supported.
The 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.
.Fn tls_config_set_keypair_mem
directly sets the public certificate and private key from memory.
.It
+.Fn tls_config_set_ocsp_staple_file
+sets a DER-encoded OCSP response to be stapled during the TLS handshake from
+the specified file.
+.It
+.Fn tls_config_set_ocsp_staple_mem
+sets a DER-encoded OCSP response to be stapled during the TLS handshake from
+memory.
+.It
.Fn tls_config_set_protocols
sets which versions of the protocol may be used.
Possible values are the bitwise OR of: