18 files changed, 104 insertions, 47 deletions

diff --git a/src/lib/libssl/man/OPENSSL_init_ssl.3 b/src/lib/libssl/man/OPENSSL_init_ssl.3
index ae356c9bf5..7530dbe4a3 100644
--- a/src/lib/libssl/man/OPENSSL_init_ssl.3
+++ b/src/lib/libssl/man/OPENSSL_init_ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OPENSSL_init_ssl.3,v 1.1 2018/03/17 18:52:42 schwarze Exp $
+.\" $OpenBSD: OPENSSL_init_ssl.3,v 1.2 2018/03/24 00:55:37 schwarze Exp $
 .\" Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,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: March 17 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt OPENSSL_INIT_SSL 3
 .Os
 .Sh NAME
@@ -53,7 +53,8 @@ is intended to return 1 on success or 0 on error.
 .Xr OPENSSL_init_crypto 3
 .Sh HISTORY
 .Fn OPENSSL_init_ssl
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
 .Sh BUGS
 .Fn OPENSSL_init_ssl
 silently ignores even more configuration failures than
diff --git a/src/lib/libssl/man/SSL_CIPHER_get_name.3 b/src/lib/libssl/man/SSL_CIPHER_get_name.3
index 6578d183a4..d69590922c 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.7 2018/03/23 05:50:30 schwarze Exp $
+.\" $OpenBSD: SSL_CIPHER_get_name.3,v 1.8 2018/03/24 00:55:37 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 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CIPHER_GET_NAME 3
 .Os
 .Sh NAME
@@ -333,6 +333,15 @@ appeared before SSLeay 0.8 and have been available since
 .Fn SSL_CIPHER_get_id
 first appeared in OpenSSL 1.0.1 and has been available since
 .Ox 5.3 .
+.Pp
+.Fn SSL_CIPHER_get_cipher_nid ,
+.Fn SSL_CIPHER_get_digest_nid ,
+.Fn SSL_CIPHER_get_kx_nid ,
+.Fn SSL_CIPHER_get_auth_nid ,
+and
+.Fn SSL_CIPHER_is_aead
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
 .Sh BUGS
 If
 .Fn SSL_CIPHER_description
diff --git a/src/lib/libssl/man/SSL_CTX_new.3 b/src/lib/libssl/man/SSL_CTX_new.3
index 10e1ad6a41..78b64f0631 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.8 2018/03/23 05:50:30 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_new.3,v 1.9 2018/03/24 00:55:37 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
 .\"
@@ -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 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_NEW 3
 .Os
 .Sh NAME
@@ -269,3 +269,14 @@ and
 .Fn TLSv1_2_client_method
 first appeared in OpenSSL 1.0.1 and have been available since
 .Ox 5.3 .
+.Pp
+.Fn TLS_method ,
+.Fn TLS_server_method ,
+and
+.Fn TLS_client_method
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 5.8 .
+.Pp
+.Fn SSL_CTX_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_CTX_sess_number.3 b/src/lib/libssl/man/SSL_CTX_sess_number.3
index b65596e317..d4b5f8fa2c 100644
--- a/src/lib/libssl/man/SSL_CTX_sess_number.3
+++ b/src/lib/libssl/man/SSL_CTX_sess_number.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_sess_number.3,v 1.6 2018/03/21 08:06:34 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_sess_number.3,v 1.7 2018/03/24 00:55:37 schwarze Exp $
 .\"     OpenSSL SSL_CTX_sess_number.pod 7bd27895 Mar 29 11:45:29 2017 +1000
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@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: March 21 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_SESS_NUMBER 3
 .Os
 .Sh NAME
@@ -146,6 +146,7 @@ cache size was exceeded.
 .Xr SSL_CTX_set_session_cache_mode 3 ,
 .Xr SSL_set_session 3
 .Sh HISTORY
+.Fn SSL_CTX_sess_number ,
 .Fn SSL_CTX_sess_connect ,
 .Fn SSL_CTX_sess_connect_good ,
 .Fn SSL_CTX_sess_accept ,
diff --git a/src/lib/libssl/man/SSL_CTX_set_min_proto_version.3 b/src/lib/libssl/man/SSL_CTX_set_min_proto_version.3
index 38ac9fc421..b1b313ffaf 100644
--- a/src/lib/libssl/man/SSL_CTX_set_min_proto_version.3
+++ b/src/lib/libssl/man/SSL_CTX_set_min_proto_version.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_min_proto_version.3,v 1.2 2018/03/15 12:27:01 jca Exp $
+.\" $OpenBSD: SSL_CTX_set_min_proto_version.3,v 1.3 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL 3edabd3c Sep 14 09:28:39 2017 +0200
 .\"
 .\" This file was written by Kurt Roeckx <kurt@roeckx.be> and
@@ -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 15 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_SET_MIN_PROTO_VERSION 3
 .Os
 .Sh NAME
@@ -149,6 +149,6 @@ the longer names one month later.
 They have been available since
 .Ox 6.2 .
 .Pp
-The getter functions first appeared in OpenSSL 1.1.1
+The getter functions first appeared in OpenSSL 1.1.0g
 and have been available since
 .Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_CTX_set_options.3 b/src/lib/libssl/man/SSL_CTX_set_options.3
index 9c33b88b84..090a767874 100644
--- a/src/lib/libssl/man/SSL_CTX_set_options.3
+++ b/src/lib/libssl/man/SSL_CTX_set_options.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_options.3,v 1.10 2018/03/23 02:21:08 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_options.3,v 1.11 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL 7946ab33 Dec 6 17:56:41 2015 +0100
 .\" selective merge up to: OpenSSL edb79c3a Mar 29 10:07:14 2017 +1000
 .\"
@@ -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 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_SET_OPTIONS 3
 .Os
 .Sh NAME
@@ -350,8 +350,10 @@ returns 1 is the peer supports secure renegotiation and 0 if it does not.
 .Xr SSL_CTX_set_min_proto_version 3 ,
 .Xr SSL_new 3
 .Sh HISTORY
+.Fn SSL_CTX_set_options
+and
 .Fn SSL_set_options
-first appeared in SSLeay 0.9.0 and has been available since
+first appeared in SSLeay 0.9.0 and have been available since
 .Ox 2.4 .
 .Pp
 .Fn SSL_CTX_get_options
diff --git a/src/lib/libssl/man/SSL_CTX_set_tlsext_use_srtp.3 b/src/lib/libssl/man/SSL_CTX_set_tlsext_use_srtp.3
index d4af103d42..a901b2515e 100644
--- a/src/lib/libssl/man/SSL_CTX_set_tlsext_use_srtp.3
+++ b/src/lib/libssl/man/SSL_CTX_set_tlsext_use_srtp.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_tlsext_use_srtp.3,v 1.1 2018/02/27 18:30:30 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_tlsext_use_srtp.3,v 1.2 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL 3733ce61 Aug 21 08:44:14 2017 +0100
 .\"
 .\" 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 27 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_SET_TLSEXT_USE_SRTP 3
 .Os
 .Sh NAME
@@ -186,3 +186,7 @@ object if one has been negotiated or
 otherwise.
 .Sh SEE ALSO
 .Xr SSL_export_keying_material 3
+.Sh HISTORY
+These functions 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_tmp_rsa_callback.3 b/src/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
index 7163e81c0c..ab32d41d97 100644
--- a/src/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
+++ b/src/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_set_tmp_rsa_callback.3,v 1.6 2018/03/21 16:12:41 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_set_tmp_rsa_callback.3,v 1.7 2018/03/24 00:55:37 schwarze Exp $
 .\"     OpenSSL 0b30fc90 Dec 19 15:23:05 2013 -0500
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@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: March 21 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_SET_TMP_RSA_CALLBACK 3
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@
 .Nm SSL_CTX_need_tmp_RSA ,
 .Nm SSL_set_tmp_rsa_callback ,
 .Nm SSL_set_tmp_rsa ,
-.Nm SSL_need_tmp_rsa
+.Nm SSL_need_tmp_RSA
 .Nd handle RSA keys for ephemeral key exchange
 .Sh SYNOPSIS
 .In openssl/ssl.h
@@ -78,7 +78,7 @@
 .Ft long
 .Fn SSL_set_tmp_rsa "SSL *ssl" "RSA *rsa"
 .Ft long
-.Fn SSL_need_tmp_rsa "SSL *ssl"
+.Fn SSL_need_tmp_RSA "SSL *ssl"
 .Sh DESCRIPTION
 Since they mattered only for deliberately insecure RSA authentication
 mandated by historical U.S. export restrictions, these functions
@@ -107,7 +107,8 @@ appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
 .Pp
 .Fn SSL_set_tmp_rsa_callback
+.Fn SSL_set_tmp_rsa ,
 and
-.Fn SSL_set_tmp_rsa
+.Fn SSL_need_tmp_RSA
 first appeared in OpenSSL 0.9.2b and have been available since
 .Ox 2.6 .
diff --git a/src/lib/libssl/man/SSL_CTX_use_certificate.3 b/src/lib/libssl/man/SSL_CTX_use_certificate.3
index 8b56e6160e..f51b5d960f 100644
--- a/src/lib/libssl/man/SSL_CTX_use_certificate.3
+++ b/src/lib/libssl/man/SSL_CTX_use_certificate.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_use_certificate.3,v 1.6 2018/03/21 05:07:04 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_use_certificate.3,v 1.7 2018/03/24 00:55:37 schwarze Exp $
 .\"     OpenSSL e248596b Apr 8 22:49:57 2005 +0000
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -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 21 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_CTX_USE_CERTIFICATE 3
 .Os
 .Sh NAME
@@ -416,6 +416,10 @@ and
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
 .Pp
+.Fn SSL_CTX_use_certificate_chain_file
+first appeared in OpenSSL 0.9.4 and has been available since
+.Ox 2.6 .
+.Pp
 Support for DER encoded private keys
 .Pq Dv SSL_FILETYPE_ASN1
 in
@@ -423,3 +427,7 @@ in
 and
 .Fn SSL_use_PrivateKey_file
 was added in 0.9.8.
+.Pp
+.Fn SSL_CTX_use_certificate_chain_mem
+first appeared in
+.Ox 5.7 .
diff --git a/src/lib/libssl/man/SSL_SESSION_free.3 b/src/lib/libssl/man/SSL_SESSION_free.3
index 0267748582..1a4b8af456 100644
--- a/src/lib/libssl/man/SSL_SESSION_free.3
+++ b/src/lib/libssl/man/SSL_SESSION_free.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_free.3,v 1.4 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_free.3,v 1.5 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL b31db505 Mar 24 16:01:50 2017 +0000
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>
@@ -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 24 2018 $
 .Dt SSL_SESSION_FREE 3
 .Os
 .Sh NAME
@@ -141,3 +141,7 @@ returns 1 on success or 0 on error.
 .Fn SSL_SESSION_free
 appeared before SSLeay 0.8 and has been available since
 .Ox 2.4 .
+.Pp
+.Fn SSL_SESSION_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get_id.3 b/src/lib/libssl/man/SSL_SESSION_get_id.3
index ddcd3f30b7..6d0de1e52e 100644
--- a/src/lib/libssl/man/SSL_SESSION_get_id.3
+++ b/src/lib/libssl/man/SSL_SESSION_get_id.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.5 2018/03/23 00:10:28 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.6 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL SSL_SESSION_set1_id 17b60280 Dec 21 09:08:25 2017 +0100
 .\"
@@ -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 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_SESSION_GET_ID 3
 .Os
 .Sh NAME
@@ -108,4 +108,5 @@ first appeared in OpenSSL 0.9.8 and has been available since
 .Ox 4.5 .
 .Pp
 .Fn SSL_SESSION_set1_id
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get_protocol_version.3 b/src/lib/libssl/man/SSL_SESSION_get_protocol_version.3
index 8c03d6c629..f14c0490e9 100644
--- a/src/lib/libssl/man/SSL_SESSION_get_protocol_version.3
+++ b/src/lib/libssl/man/SSL_SESSION_get_protocol_version.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_get_protocol_version.3,v 1.1 2018/02/24 19:24:09 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_get_protocol_version.3,v 1.2 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by TJ Saunders <tj@castaglia.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 24 2018 $
 .Dt SSL_SESSION_GET_PROTOCOL_VERSION 3
 .Os
 .Sh NAME
@@ -80,4 +80,5 @@ or
 .Xr SSL_SESSION_new 3
 .Sh HISTORY
 .Fn SSL_SESSION_get_protocol_version
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_SESSION_has_ticket.3 b/src/lib/libssl/man/SSL_SESSION_has_ticket.3
index c70be41e18..322b49feef 100644
--- a/src/lib/libssl/man/SSL_SESSION_has_ticket.3
+++ b/src/lib/libssl/man/SSL_SESSION_has_ticket.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_has_ticket.3,v 1.1 2018/03/17 18:19:49 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_has_ticket.3,v 1.2 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL f2baac27 Feb 8 15:43:16 2015 +0000
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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 17 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_SESSION_HAS_TICKET 3
 .Os
 .Sh NAME
@@ -80,4 +80,6 @@ returns the lifetime hint in seconds associated with the session ticket.
 .Xr SSL_SESSION_get_time 3 ,
 .Xr SSL_SESSION_new 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.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 d874df7205..dd7595baca 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.3 2018/03/23 05:50:30 schwarze Exp $
+.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.4 2018/03/24 00:55:37 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 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_SESSION_SET1_ID_CONTEXT 3
 .Os
 .Sh NAME
@@ -105,7 +105,7 @@ returns 1 on success or 0 on error.
 .Xr SSL_SESSION_new 3
 .Sh HISTORY
 .Fn SSL_SESSION_set1_id_context
-first appeared in OpenSSL 1.0.1 and have been available since
+first appeared in OpenSSL 1.0.1 and has been available since
 .Ox 5.3 .
 .Pp
 .Fn SSL_SESSION_get0_id_context
diff --git a/src/lib/libssl/man/SSL_get_ciphers.3 b/src/lib/libssl/man/SSL_get_ciphers.3
index 284809fcfe..a9e955be18 100644
--- a/src/lib/libssl/man/SSL_get_ciphers.3
+++ b/src/lib/libssl/man/SSL_get_ciphers.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_get_ciphers.3,v 1.4 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_get_ciphers.3,v 1.5 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL c3e64028 Mar 30 11:50:14 2005 +0000
 .\" selective merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
@@ -51,7 +51,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 24 2018 $
 .Dt SSL_GET_CIPHERS 3
 .Os
 .Sh NAME
@@ -141,3 +141,7 @@ and
 .Fn SSL_get_cipher_list
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn SSL_CTX_get_ciphers
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_get_client_random.3 b/src/lib/libssl/man/SSL_get_client_random.3
index 8ab663846a..eda74db355 100644
--- a/src/lib/libssl/man/SSL_get_client_random.3
+++ b/src/lib/libssl/man/SSL_get_client_random.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_get_client_random.3,v 1.1 2018/02/18 23:34:01 schwarze Exp $
+.\" $OpenBSD: SSL_get_client_random.3,v 1.2 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Nick Mathewson <nickm@torproject.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 18 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_GET_CLIENT_RANDOM 3
 .Os
 .Sh NAME
@@ -144,3 +144,7 @@ copy \(em that is, the length of the underlying field.
 .Xr SSL_SESSION_get_id 3 ,
 .Xr SSL_SESSION_get_time 3 ,
 .Xr SSL_SESSION_new 3
+.Sh HISTORY
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_get_server_tmp_key.3 b/src/lib/libssl/man/SSL_get_server_tmp_key.3
index 282352d2bd..6bd102e863 100644
--- a/src/lib/libssl/man/SSL_get_server_tmp_key.3
+++ b/src/lib/libssl/man/SSL_get_server_tmp_key.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_get_server_tmp_key.3,v 1.2 2018/03/23 14:28:16 schwarze Exp $
+.\"     $OpenBSD: SSL_get_server_tmp_key.3,v 1.3 2018/03/24 00:55:37 schwarze Exp $
 .\"     OpenSSL SSL_get_server_tmp_key.pod 508fafd8 Apr 3 15:41:21 2017 +0100
 .\"
 .\" 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: March 23 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_GET_SERVER_TMP_KEY 3
 .Os
 .Sh NAME
@@ -84,5 +84,5 @@ returns 1 on success or 0 on failure.
 .Xr SSL_ctrl 3
 .Sh HISTORY
 .Fn SSL_get_server_tmp_key
-first appeared in OpenSSL 1.0.2 and have been available since
+first appeared in OpenSSL 1.0.2 and has been available since
 .Ox 6.1 .
diff --git a/src/lib/libssl/man/SSL_new.3 b/src/lib/libssl/man/SSL_new.3
index 67e81fb520..b0d55eca71 100644
--- a/src/lib/libssl/man/SSL_new.3
+++ b/src/lib/libssl/man/SSL_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_new.3,v 1.4 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_new.3,v 1.5 2018/03/24 00:55:37 schwarze Exp $
 .\" full merge up to: OpenSSL 1c7ae3dd Mar 29 19:17:55 2017 +1000
 .\"
 .\" This file was written by Richard Levitte <levitte@openssl.org>
@@ -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 21 2018 $
+.Dd $Mdocdate: March 24 2018 $
 .Dt SSL_NEW 3
 .Os
 .Sh NAME
@@ -103,3 +103,7 @@ returns 1 for success or 0 for failure.
 .Fn SSL_new
 appeared before SSLeay 0.8 and has been available since
 .Ox 2.4 .
+.Pp
+.Fn SSL_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .