11 files changed, 86 insertions, 23 deletions

diff --git a/src/lib/libssl/man/BIO_f_ssl.3 b/src/lib/libssl/man/BIO_f_ssl.3
index 3a95f1f080..6826441e81 100644
--- a/src/lib/libssl/man/BIO_f_ssl.3
+++ b/src/lib/libssl/man/BIO_f_ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_f_ssl.3,v 1.7 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: BIO_f_ssl.3,v 1.8 2018/03/21 08:06:34 schwarze Exp $
 .\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -575,7 +575,15 @@ BIO_free_all(sbio);
 .Fn BIO_ssl_shutdown ,
 and
 .Fn BIO_do_handshake
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8.
+.Fn BIO_set_ssl_renegotiate_bytes ,
+.Fn BIO_get_num_renegotiates ,
+.Fn BIO_set_ssl_renegotiate_timeout ,
+.Fn BIO_new_ssl_connect ,
+and
+.Fn BIO_new_buffer_ssl_connect
+first appeared in SSLeay 0.9.0.
+All these functions have been available since
 .Ox 2.4 .
 .Pp
 In OpenSSL versions before 1.0.0 the
diff --git a/src/lib/libssl/man/SSL_CTX_get_ex_new_index.3 b/src/lib/libssl/man/SSL_CTX_get_ex_new_index.3
index cd2c0dc8ec..3dbaf2e981 100644
--- a/src/lib/libssl/man/SSL_CTX_get_ex_new_index.3
+++ b/src/lib/libssl/man/SSL_CTX_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
 .\"     OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
 .\"
 .\" 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: December 6 2016 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_CTX_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -115,3 +115,10 @@ functionality is described in
 .Xr CRYPTO_set_ex_data 3 ,
 .Xr RSA_get_ex_new_index 3 ,
 .Xr ssl 3
+.Sh HISTORY
+.Fn SSL_CTX_get_ex_new_index ,
+.Fn SSL_CTX_set_ex_data ,
+and
+.Fn SSL_CTX_get_ex_data
+first appeared in SSLeay 0.9.0 and have been available since
+.Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_CTX_new.3 b/src/lib/libssl/man/SSL_CTX_new.3
index d16faf096f..8f1ab4d00a 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.5 2018/03/21 05:07:04 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_new.3,v 1.6 2018/03/21 08:06:34 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
 .\"
@@ -244,5 +244,11 @@ returns 1 for success or 0 for failure.
 .Fn SSLv23_server_method ,
 and
 .Fn SSLv23_client_method
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8.
+.Fn TLSv1_method ,
+.Fn TLSv1_server_method ,
+and
+.Fn TLSv1_client_method
+first appeared in SSLeay 0.9.0.
+All these functions have been available since
 .Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_CTX_sess_number.3 b/src/lib/libssl/man/SSL_CTX_sess_number.3
index 2843e629e7..b65596e317 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.5 2018/03/21 05:07:04 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_sess_number.3,v 1.6 2018/03/21 08:06:34 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>.
@@ -155,5 +155,11 @@ cache size was exceeded.
 .Fn SSL_CTX_sess_misses ,
 and
 .Fn SSL_CTX_sess_timeouts
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8.
+.Fn SSL_CTX_sess_connect_renegotiate ,
+.Fn SSL_CTX_sess_accept_renegotiate ,
+and
+.Fn SSL_CTX_sess_cache_full
+first appeared in SSLeay 0.9.0.
+All these functions have been available since
 .Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 b/src/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
index 0533a5472a..0b9e69a674 100644
--- a/src/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
+++ b/src/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.3 2017/04/10 14:00:51 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.4 2018/03/21 08:06:34 schwarze Exp $
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" 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: April 10 2017 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_CTX_SESS_SET_CACHE_SIZE 3
 .Os
 .Sh NAME
@@ -100,3 +100,9 @@ returns the currently valid size.
 .Xr SSL_CTX_flush_sessions 3 ,
 .Xr SSL_CTX_sess_number 3 ,
 .Xr SSL_CTX_set_session_cache_mode 3
+.Sh HISTORY
+.Fn SSL_CTX_sess_set_cache_size
+and
+.Fn SSL_CTX_sess_get_cache_size
+first appeared in SSLeay 0.9.0 and have been available since
+.Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_CTX_set_options.3 b/src/lib/libssl/man/SSL_CTX_set_options.3
index 0e71083827..e61779eb13 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.7 2018/02/27 17:35:05 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_options.3,v 1.8 2018/03/21 08:06:34 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: February 27 2018 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_CTX_SET_OPTIONS 3
 .Os
 .Sh NAME
@@ -350,6 +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_set_options
+first appeared in SSLeay 0.9.0 and has been available since
+.Ox 2.4 .
+.Pp
 .Fn SSL_CTX_clear_options
 and
 .Fn SSL_clear_options
diff --git a/src/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 b/src/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
index 51cfc50568..9fd6949b6a 100644
--- a/src/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
+++ b/src/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $
+.\"     $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
 .\"     OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
 .\"
 .\" 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: December 6 2016 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_SESSION_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -125,3 +125,10 @@ and can therefore not be restored.
 .Xr CRYPTO_set_ex_data 3 ,
 .Xr RSA_get_ex_new_index 3 ,
 .Xr ssl 3
+.Sh HISTORY
+.Fn SSL_SESSION_get_ex_new_index ,
+.Fn SSL_SESSION_set_ex_data ,
+and
+.Fn SSL_SESSION_get_ex_data
+first appeared in SSLeay 0.9.0 and have been available since
+.Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get_time.3 b/src/lib/libssl/man/SSL_SESSION_get_time.3
index 87df2429d7..c15ba3dfbb 100644
--- a/src/lib/libssl/man/SSL_SESSION_get_time.3
+++ b/src/lib/libssl/man/SSL_SESSION_get_time.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.5 2018/03/21 05:07:04 schwarze Exp $
+.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.6 2018/03/21 08:06:34 schwarze Exp $
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -153,5 +153,12 @@ pointer for the session
 .Fn SSL_get_timeout ,
 and
 .Fn SSL_set_timeout
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8.
+.Fn SSL_SESSION_get_time ,
+.Fn SSL_SESSION_set_time ,
+.Fn SSL_SESSION_get_timeout ,
+and
+.Fn SSL_SESSION_set_timeout
+first appeared in SSLeay 0.9.0.
+All these functions have been available since
 .Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_get_ex_new_index.3 b/src/lib/libssl/man/SSL_get_ex_new_index.3
index 070baa5a06..c4af30a208 100644
--- a/src/lib/libssl/man/SSL_get_ex_new_index.3
+++ b/src/lib/libssl/man/SSL_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $
+.\"     $OpenBSD: SSL_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
 .\"     OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
 .\"
 .\" 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: December 6 2016 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -121,3 +121,10 @@ in
 .Xr RSA_get_ex_new_index 3 ,
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_verify 3
+.Sh HISTORY
+.Fn SSL_get_ex_new_index ,
+.Fn SSL_set_ex_data ,
+and
+.Fn SSL_get_ex_data
+first appeared in SSLeay 0.9.0 and have been available since
+.Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_get_state.3 b/src/lib/libssl/man/SSL_get_state.3
index 86ae336a12..1d586df7de 100644
--- a/src/lib/libssl/man/SSL_get_state.3
+++ b/src/lib/libssl/man/SSL_get_state.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_get_state.3,v 1.2 2018/03/21 05:07:04 schwarze Exp $
+.\"     $OpenBSD: SSL_get_state.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -150,5 +150,8 @@ All these functions may be implemented as macros.
 .Fn SSL_in_init ,
 and
 .Fn SSL_is_init_finished
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8.
+.Fn SSL_get_state
+first appeared in SSLeay 0.9.0.
+These functions have been available since
 .Ox 2.4 .
diff --git a/src/lib/libssl/man/SSL_num_renegotiations.3 b/src/lib/libssl/man/SSL_num_renegotiations.3
index 7b380d93de..7a864187f6 100644
--- a/src/lib/libssl/man/SSL_num_renegotiations.3
+++ b/src/lib/libssl/man/SSL_num_renegotiations.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_num_renegotiations.3,v 1.3 2017/07/05 11:43:09 schwarze Exp $
+.\"     $OpenBSD: SSL_num_renegotiations.3,v 1.4 2018/03/21 08:06:34 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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: July 5 2017 $
+.Dd $Mdocdate: March 21 2018 $
 .Dt SSL_NUM_RENEGOTIATIONS 3
 .Os
 .Sh NAME
@@ -69,4 +69,6 @@ All these functions return a number of renegotiations.
 .Xr SSL_renegotiate 3 ,
 .Xr SSL_write 3
 .Sh HISTORY
-These functions are available in all versions of OpenSSL.
+These functions first appeared in SSLeay 0.9.0
+and have been available since
+.Ox 2.4 .