6 files changed, 41 insertions, 9 deletions

diff --git a/src/lib/libssl/man/SSL_CTX_get0_certificate.3 b/src/lib/libssl/man/SSL_CTX_get0_certificate.3
index 3986912035..d63ad572b1 100644
--- a/src/lib/libssl/man/SSL_CTX_get0_certificate.3
+++ b/src/lib/libssl/man/SSL_CTX_get0_certificate.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_get0_certificate.3,v 1.1 2018/02/18 22:18:59 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_get0_certificate.3,v 1.2 2018/03/23 14:28:16 schwarze Exp $
 .\"
 .\" Copyright (c) 2018 Ingo Schwarze <schwarze@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: February 18 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_CTX_GET0_CERTIFICATE 3
 .Os
 .Sh NAME
@@ -44,3 +44,7 @@ The returned pointer must not be freed by the caller.
 .Xr X509_get_pubkey 3 ,
 .Xr X509_get_subject_name 3 ,
 .Xr X509_new 3
+.Sh HISTORY
+.Fn SSL_CTX_get0_certificate
+first appeared in OpenSSL 1.0.2 and have been available since
+.Ox 6.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 ca8a15a071..540fd011f5 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.6 2018/03/23 05:50:30 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.7 2018/03/23 14:28:16 schwarze Exp $
 .\"     OpenSSL 87b81496 Apr 19 12:38:27 2017 -0400
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
@@ -263,3 +263,11 @@ ALPN protocol not selected.
 .Fn SSL_select_next_proto
 first appeared in OpenSSL 1.0.1 and has been available since
 .Ox 5.3 .
+.Pp
+.Fn SSL_CTX_set_alpn_protos ,
+.Fn SSL_set_alpn_protos ,
+.Fn SSL_CTX_set_alpn_select_cb ,
+and
+.Fn SSL_get0_alpn_selected
+first appeared in OpenSSL 1.0.2 and have been available since
+.Ox 5.7 .
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 66e362f6e9..282352d2bd 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.1 2017/04/10 15:54:46 schwarze Exp $
+.\"     $OpenBSD: SSL_get_server_tmp_key.3,v 1.2 2018/03/23 14:28:16 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: April 10 2017 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt SSL_GET_SERVER_TMP_KEY 3
 .Os
 .Sh NAME
@@ -82,3 +82,7 @@ returns 1 on success or 0 on failure.
 .Sh SEE ALSO
 .Xr EVP_PKEY_free 3 ,
 .Xr SSL_ctrl 3
+.Sh HISTORY
+.Fn SSL_get_server_tmp_key
+first appeared in OpenSSL 1.0.2 and have been available since
+.Ox 6.1 .
diff --git a/src/lib/libssl/man/SSL_set1_param.3 b/src/lib/libssl/man/SSL_set1_param.3
index 7f89a2d002..5697ac6424 100644
--- a/src/lib/libssl/man/SSL_set1_param.3
+++ b/src/lib/libssl/man/SSL_set1_param.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_set1_param.3,v 1.3 2018/03/23 04:35:09 schwarze Exp $
+.\" $OpenBSD: SSL_set1_param.3,v 1.4 2018/03/23 14:28:16 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL man3/SSL_CTX_get0_param 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
@@ -128,3 +128,9 @@ and
 .Fn SSL_set1_param
 first appeared in OpenSSL 1.0.0 and have been available since
 .Ox 4.9 .
+.Pp
+.Fn SSL_CTX_get0_param
+and
+.Fn SSL_get0_param
+first appeared in OpenSSL 1.0.2 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_set_connect_state.3 b/src/lib/libssl/man/SSL_set_connect_state.3
index 548937c66b..7e3a39985b 100644
--- a/src/lib/libssl/man/SSL_set_connect_state.3
+++ b/src/lib/libssl/man/SSL_set_connect_state.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_set_connect_state.3,v 1.4 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_set_connect_state.3,v 1.5 2018/03/23 14:28:16 schwarze Exp $
 .\" full merge up to OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\" selective merge up to: OpenSSL dbd007d7 Jul 28 13:31:27 2017 +0800
 .\"
@@ -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_SET_CONNECT_STATE 3
 .Os
 .Sh NAME
@@ -147,3 +147,7 @@ and
 .Fn SSL_set_accept_state
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn SSL_is_server
+first appeared in OpenSSL 1.0.2 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libssl/man/SSL_set_tmp_ecdh.3 b/src/lib/libssl/man/SSL_set_tmp_ecdh.3
index 9715a287eb..e906bfdd0c 100644
--- a/src/lib/libssl/man/SSL_set_tmp_ecdh.3
+++ b/src/lib/libssl/man/SSL_set_tmp_ecdh.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_set_tmp_ecdh.3,v 1.4 2018/03/23 00:10:28 schwarze Exp $
+.\"     $OpenBSD: SSL_set_tmp_ecdh.3,v 1.5 2018/03/23 14:28:16 schwarze Exp $
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -111,3 +111,9 @@ and
 .Fn SSL_CTX_set_tmp_ecdh_callback
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
+.Pp
+.Fn SSL_CTX_set_ecdh_auto
+and
+.Fn SSL_set_ecdh_auto
+first appeared in OpenSSL 1.0.2 and have been available since
+.Ox 5.7 .