9 files changed, 60 insertions, 18 deletions

diff --git a/src/lib/libssl/man/SSL_CIPHER_get_name.3 b/src/lib/libssl/man/SSL_CIPHER_get_name.3
index 16cf34f61a..6578d183a4 100644
--- a/src/lib/libssl/man/SSL_CIPHER_get_name.3
+++ b/src/lib/libssl/man/SSL_CIPHER_get_name.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CIPHER_get_name.3,v 1.6 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_CIPHER_get_name.3,v 1.7 2018/03/23 05:50:30 schwarze Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -52,7 +52,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_CIPHER_GET_NAME 3
 .Os
 .Sh NAME
@@ -329,6 +329,10 @@ and
 .Fn SSL_CIPHER_description
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn SSL_CIPHER_get_id
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
 .Sh BUGS
 If
 .Fn SSL_CIPHER_description
diff --git a/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 b/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
index 0509868ab1..1feee4265c 100644
--- a/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
+++ b/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.4 2018/03/21 09:05:04 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.5 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL f0d6ee6be Feb 15 07:41:42 2002 +0000
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3
 .Os
 .Sh NAME
@@ -107,6 +107,10 @@ Check out the error stack to find out the reason for failure.
 .Fn SSL_CTX_add_extra_chain_cert
 first appeared in SSLeay 0.9.1 and has been available since
 .Ox 2.6 .
+.Pp
+.Fn SSL_CTX_clear_extra_chain_certs
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
 .Sh CAVEATS
 Only one set of extra chain certificates can be specified per
 .Vt SSL_CTX
diff --git a/src/lib/libssl/man/SSL_CTX_new.3 b/src/lib/libssl/man/SSL_CTX_new.3
index 85405a7c85..10e1ad6a41 100644
--- a/src/lib/libssl/man/SSL_CTX_new.3
+++ b/src/lib/libssl/man/SSL_CTX_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_new.3,v 1.7 2018/03/23 00:10:28 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_new.3,v 1.8 2018/03/23 05:50:30 schwarze Exp $
 .\" full merge up to: OpenSSL 21cd6e00 Oct 21 14:40:15 2015 +0100
 .\" selective merge up to: OpenSSL eb43101f Dec 9 18:07:09 2016 +0100
 .\"
@@ -259,3 +259,13 @@ and
 .Fn DTLSv1_client_method
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
+.Pp
+.Fn TLSv1_1_method ,
+.Fn TLSv1_1_server_method ,
+.Fn TLSv1_1_client_method ,
+.Fn TLSv1_2_method ,
+.Fn TLSv1_2_server_method ,
+and
+.Fn TLSv1_2_client_method
+first appeared in OpenSSL 1.0.1 and have been available since
+.Ox 5.3 .
diff --git a/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 b/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3
index 2c0905123b..ca8a15a071 100644
--- a/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3
+++ b/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.5 2017/08/28 17:36:58 jsing Exp $
+.\"     $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.6 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL 87b81496 Apr 19 12:38:27 2017 -0400
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 28 2017 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_CTX_SET_ALPN_SELECT_CB 3
 .Os
 .Sh NAME
@@ -259,3 +259,7 @@ ALPN protocol not selected.
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_tlsext_servername_arg 3 ,
 .Xr SSL_CTX_set_tlsext_servername_callback 3
+.Sh HISTORY
+.Fn SSL_select_next_proto
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get0_peer.3 b/src/lib/libssl/man/SSL_SESSION_get0_peer.3
index 2c5e6ce7e8..6b1ef6680e 100644
--- a/src/lib/libssl/man/SSL_SESSION_get0_peer.3
+++ b/src/lib/libssl/man/SSL_SESSION_get0_peer.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_SESSION_get0_peer.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $
+.\"     $OpenBSD: SSL_SESSION_get0_peer.3,v 1.2 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL SSL_SESSION_get0_peer.pod b31db505 Mar 24 16:01:50 2017 +0000
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 10 2017 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_SESSION_GET0_PEER 3
 .Os
 .Sh NAME
@@ -74,3 +74,7 @@ has also been called.
 .Xr ssl 3 ,
 .Xr SSL_get_session 3 ,
 .Xr SSL_SESSION_new 3
+.Sh HISTORY
+.Fn SSL_SESSION_get0_peer
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get_compress_id.3 b/src/lib/libssl/man/SSL_SESSION_get_compress_id.3
index 7d284002a3..aedc216a15 100644
--- a/src/lib/libssl/man/SSL_SESSION_get_compress_id.3
+++ b/src/lib/libssl/man/SSL_SESSION_get_compress_id.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.2 2018/02/24 19:24:09 schwarze Exp $
+.\"     $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.3 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 24 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_SESSION_GET_COMPRESS_ID 3
 .Os
 .Sh NAME
@@ -72,3 +72,7 @@ which has an id of 1.
 .Xr SSL_SESSION_get_id 3 ,
 .Xr SSL_SESSION_get_protocol_version 3 ,
 .Xr SSL_SESSION_new 3
+.Sh HISTORY
+.Fn SSL_SESSION_get_compress_id
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_set1_id_context.3 b/src/lib/libssl/man/SSL_SESSION_set1_id_context.3
index 29f08781a6..d874df7205 100644
--- a/src/lib/libssl/man/SSL_SESSION_set1_id_context.3
+++ b/src/lib/libssl/man/SSL_SESSION_set1_id_context.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.2 2018/03/18 07:57:19 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.3 2018/03/23 05:50:30 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL SSL_SESSION_get0_id_context b31db505 Mar 24 16:01:50 2017
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 18 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_SESSION_SET1_ID_CONTEXT 3
 .Os
 .Sh NAME
@@ -104,6 +104,10 @@ returns 1 on success or 0 on error.
 .Xr SSL_get_session 3 ,
 .Xr SSL_SESSION_new 3
 .Sh HISTORY
-.Fa SSL_SESSION_get0_id_context
+.Fn SSL_SESSION_set1_id_context
+first appeared in OpenSSL 1.0.1 and have been available since
+.Ox 5.3 .
+.Pp
+.Fn SSL_SESSION_get0_id_context
 first appeared in OpenSSL 1.1.0 and has been available since
 .Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_export_keying_material.3 b/src/lib/libssl/man/SSL_export_keying_material.3
index 613446a275..fe1ed748d5 100644
--- a/src/lib/libssl/man/SSL_export_keying_material.3
+++ b/src/lib/libssl/man/SSL_export_keying_material.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_export_keying_material.3,v 1.1 2017/08/21 10:10:25 schwarze Exp $
+.\"     $OpenBSD: SSL_export_keying_material.3,v 1.2 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL a599574b Jun 28 17:18:27 2017 +0100
 .\"     OpenSSL 23cec1f4 Jun 21 13:55:02 2017 +0100
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2017 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_EXPORT_KEYING_MATERIAL 3
 .Os
 .Sh NAME
@@ -125,3 +125,7 @@ standard to be used without registration.
 .Sh RETURN VALUES
 .Fn SSL_export_keying_material
 returns 1 on success or 0 or -1 on failure.
+.Sh HISTORY
+.Fn SSL_export_keying_material
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .
diff --git a/src/lib/libssl/man/SSL_renegotiate.3 b/src/lib/libssl/man/SSL_renegotiate.3
index 0962b1e859..2c90b3ef04 100644
--- a/src/lib/libssl/man/SSL_renegotiate.3
+++ b/src/lib/libssl/man/SSL_renegotiate.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_renegotiate.3,v 1.6 2018/03/22 21:09:18 schwarze Exp $
+.\"     $OpenBSD: SSL_renegotiate.3,v 1.7 2018/03/23 05:50:30 schwarze Exp $
 .\"     OpenSSL SSL_key_update.pod 4fbfe86a Feb 16 17:04:40 2017 +0000
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_RENEGOTIATE 3
 .Os
 .Sh NAME
@@ -159,3 +159,7 @@ appeared before SSLeay 0.8 and has been available since
 .Fn SSL_renegotiate_pending
 first appeared in OpenSSL 0.9.7 and has been available since
 .Ox 3.2 .
+.Pp
+.Fn SSL_renegotiate_abbreviated
+first appeared in OpenSSL 1.0.1 and has been available since
+.Ox 5.3 .