summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2018-03-21 08:06:34 +0000
committerschwarze <>2018-03-21 08:06:34 +0000
commitc111f1d68460275d71b3bdd26932e5b7163b741e (patch)
treebc7842f030d249f18e9426ba52833beaf955c834
parent052575acc932cac51baa9c7e5400fec2ee9c8e71 (diff)
downloadopenbsd-c111f1d68460275d71b3bdd26932e5b7163b741e.tar.gz
openbsd-c111f1d68460275d71b3bdd26932e5b7163b741e.tar.bz2
openbsd-c111f1d68460275d71b3bdd26932e5b7163b741e.zip
ssl.h HISTORY up to SSLeay 0.9.0; researched from OpenSSL git
-rw-r--r--src/lib/libssl/man/BIO_f_ssl.312
-rw-r--r--src/lib/libssl/man/SSL_CTX_get_ex_new_index.311
-rw-r--r--src/lib/libssl/man/SSL_CTX_new.310
-rw-r--r--src/lib/libssl/man/SSL_CTX_sess_number.310
-rw-r--r--src/lib/libssl/man/SSL_CTX_sess_set_cache_size.310
-rw-r--r--src/lib/libssl/man/SSL_CTX_set_options.38
-rw-r--r--src/lib/libssl/man/SSL_SESSION_get_ex_new_index.311
-rw-r--r--src/lib/libssl/man/SSL_SESSION_get_time.311
-rw-r--r--src/lib/libssl/man/SSL_get_ex_new_index.311
-rw-r--r--src/lib/libssl/man/SSL_get_state.37
-rw-r--r--src/lib/libssl/man/SSL_num_renegotiations.38
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 @@
1.\" $OpenBSD: BIO_f_ssl.3,v 1.7 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: BIO_f_ssl.3,v 1.8 2018/03/21 08:06:34 schwarze Exp $
2.\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500 2.\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500
3.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800 3.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
4.\" 4.\"
@@ -575,7 +575,15 @@ BIO_free_all(sbio);
575.Fn BIO_ssl_shutdown , 575.Fn BIO_ssl_shutdown ,
576and 576and
577.Fn BIO_do_handshake 577.Fn BIO_do_handshake
578appeared before SSLeay 0.8 and have been available since 578appeared before SSLeay 0.8.
579.Fn BIO_set_ssl_renegotiate_bytes ,
580.Fn BIO_get_num_renegotiates ,
581.Fn BIO_set_ssl_renegotiate_timeout ,
582.Fn BIO_new_ssl_connect ,
583and
584.Fn BIO_new_buffer_ssl_connect
585first appeared in SSLeay 0.9.0.
586All these functions have been available since
579.Ox 2.4 . 587.Ox 2.4 .
580.Pp 588.Pp
581In OpenSSL versions before 1.0.0 the 589In 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 @@
1.\" $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: December 6 2016 $ 51.Dd $Mdocdate: March 21 2018 $
52.Dt SSL_CTX_GET_EX_NEW_INDEX 3 52.Dt SSL_CTX_GET_EX_NEW_INDEX 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -115,3 +115,10 @@ functionality is described in
115.Xr CRYPTO_set_ex_data 3 , 115.Xr CRYPTO_set_ex_data 3 ,
116.Xr RSA_get_ex_new_index 3 , 116.Xr RSA_get_ex_new_index 3 ,
117.Xr ssl 3 117.Xr ssl 3
118.Sh HISTORY
119.Fn SSL_CTX_get_ex_new_index ,
120.Fn SSL_CTX_set_ex_data ,
121and
122.Fn SSL_CTX_get_ex_data
123first appeared in SSLeay 0.9.0 and have been available since
124.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 @@
1.\" $OpenBSD: SSL_CTX_new.3,v 1.5 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_new.3,v 1.6 2018/03/21 08:06:34 schwarze Exp $
2.\" full merge up to: OpenSSL 21cd6e00 Oct 21 14:40:15 2015 +0100 2.\" full merge up to: OpenSSL 21cd6e00 Oct 21 14:40:15 2015 +0100
3.\" selective merge up to: OpenSSL eb43101f Dec 9 18:07:09 2016 +0100 3.\" selective merge up to: OpenSSL eb43101f Dec 9 18:07:09 2016 +0100
4.\" 4.\"
@@ -244,5 +244,11 @@ returns 1 for success or 0 for failure.
244.Fn SSLv23_server_method , 244.Fn SSLv23_server_method ,
245and 245and
246.Fn SSLv23_client_method 246.Fn SSLv23_client_method
247appeared before SSLeay 0.8 and have been available since 247appeared before SSLeay 0.8.
248.Fn TLSv1_method ,
249.Fn TLSv1_server_method ,
250and
251.Fn TLSv1_client_method
252first appeared in SSLeay 0.9.0.
253All these functions have been available since
248.Ox 2.4 . 254.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 @@
1.\" $OpenBSD: SSL_CTX_sess_number.3,v 1.5 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_sess_number.3,v 1.6 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL SSL_CTX_sess_number.pod 7bd27895 Mar 29 11:45:29 2017 +1000 2.\" OpenSSL SSL_CTX_sess_number.pod 7bd27895 Mar 29 11:45:29 2017 +1000
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -155,5 +155,11 @@ cache size was exceeded.
155.Fn SSL_CTX_sess_misses , 155.Fn SSL_CTX_sess_misses ,
156and 156and
157.Fn SSL_CTX_sess_timeouts 157.Fn SSL_CTX_sess_timeouts
158appeared before SSLeay 0.8 and have been available since 158appeared before SSLeay 0.8.
159.Fn SSL_CTX_sess_connect_renegotiate ,
160.Fn SSL_CTX_sess_accept_renegotiate ,
161and
162.Fn SSL_CTX_sess_cache_full
163first appeared in SSLeay 0.9.0.
164All these functions have been available since
159.Ox 2.4 . 165.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 @@
1.\" $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.3 2017/04/10 14:00:51 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.4 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 2.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: April 10 2017 $ 51.Dd $Mdocdate: March 21 2018 $
52.Dt SSL_CTX_SESS_SET_CACHE_SIZE 3 52.Dt SSL_CTX_SESS_SET_CACHE_SIZE 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -100,3 +100,9 @@ returns the currently valid size.
100.Xr SSL_CTX_flush_sessions 3 , 100.Xr SSL_CTX_flush_sessions 3 ,
101.Xr SSL_CTX_sess_number 3 , 101.Xr SSL_CTX_sess_number 3 ,
102.Xr SSL_CTX_set_session_cache_mode 3 102.Xr SSL_CTX_set_session_cache_mode 3
103.Sh HISTORY
104.Fn SSL_CTX_sess_set_cache_size
105and
106.Fn SSL_CTX_sess_get_cache_size
107first appeared in SSLeay 0.9.0 and have been available since
108.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 @@
1.\" $OpenBSD: SSL_CTX_set_options.3,v 1.7 2018/02/27 17:35:05 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_set_options.3,v 1.8 2018/03/21 08:06:34 schwarze Exp $
2.\" full merge up to: OpenSSL 7946ab33 Dec 6 17:56:41 2015 +0100 2.\" full merge up to: OpenSSL 7946ab33 Dec 6 17:56:41 2015 +0100
3.\" selective merge up to: OpenSSL edb79c3a Mar 29 10:07:14 2017 +1000 3.\" selective merge up to: OpenSSL edb79c3a Mar 29 10:07:14 2017 +1000
4.\" 4.\"
@@ -52,7 +52,7 @@
52.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 52.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
53.\" OF THE POSSIBILITY OF SUCH DAMAGE. 53.\" OF THE POSSIBILITY OF SUCH DAMAGE.
54.\" 54.\"
55.Dd $Mdocdate: February 27 2018 $ 55.Dd $Mdocdate: March 21 2018 $
56.Dt SSL_CTX_SET_OPTIONS 3 56.Dt SSL_CTX_SET_OPTIONS 3
57.Os 57.Os
58.Sh NAME 58.Sh NAME
@@ -350,6 +350,10 @@ returns 1 is the peer supports secure renegotiation and 0 if it does not.
350.Xr SSL_CTX_set_min_proto_version 3 , 350.Xr SSL_CTX_set_min_proto_version 3 ,
351.Xr SSL_new 3 351.Xr SSL_new 3
352.Sh HISTORY 352.Sh HISTORY
353.Fn SSL_set_options
354first appeared in SSLeay 0.9.0 and has been available since
355.Ox 2.4 .
356.Pp
353.Fn SSL_CTX_clear_options 357.Fn SSL_CTX_clear_options
354and 358and
355.Fn SSL_clear_options 359.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 @@
1.\" $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: December 6 2016 $ 51.Dd $Mdocdate: March 21 2018 $
52.Dt SSL_SESSION_GET_EX_NEW_INDEX 3 52.Dt SSL_SESSION_GET_EX_NEW_INDEX 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -125,3 +125,10 @@ and can therefore not be restored.
125.Xr CRYPTO_set_ex_data 3 , 125.Xr CRYPTO_set_ex_data 3 ,
126.Xr RSA_get_ex_new_index 3 , 126.Xr RSA_get_ex_new_index 3 ,
127.Xr ssl 3 127.Xr ssl 3
128.Sh HISTORY
129.Fn SSL_SESSION_get_ex_new_index ,
130.Fn SSL_SESSION_set_ex_data ,
131and
132.Fn SSL_SESSION_get_ex_data
133first appeared in SSLeay 0.9.0 and have been available since
134.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 @@
1.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.5 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.6 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 2.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -153,5 +153,12 @@ pointer for the session
153.Fn SSL_get_timeout , 153.Fn SSL_get_timeout ,
154and 154and
155.Fn SSL_set_timeout 155.Fn SSL_set_timeout
156appeared before SSLeay 0.8 and have been available since 156appeared before SSLeay 0.8.
157.Fn SSL_SESSION_get_time ,
158.Fn SSL_SESSION_set_time ,
159.Fn SSL_SESSION_get_timeout ,
160and
161.Fn SSL_SESSION_set_timeout
162first appeared in SSLeay 0.9.0.
163All these functions have been available since
157.Ox 2.4 . 164.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 @@
1.\" $OpenBSD: SSL_get_ex_new_index.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $ 1.\" $OpenBSD: SSL_get_ex_new_index.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: December 6 2016 $ 51.Dd $Mdocdate: March 21 2018 $
52.Dt SSL_GET_EX_NEW_INDEX 3 52.Dt SSL_GET_EX_NEW_INDEX 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -121,3 +121,10 @@ in
121.Xr RSA_get_ex_new_index 3 , 121.Xr RSA_get_ex_new_index 3 ,
122.Xr ssl 3 , 122.Xr ssl 3 ,
123.Xr SSL_CTX_set_verify 3 123.Xr SSL_CTX_set_verify 3
124.Sh HISTORY
125.Fn SSL_get_ex_new_index ,
126.Fn SSL_set_ex_data ,
127and
128.Fn SSL_get_ex_data
129first appeared in SSLeay 0.9.0 and have been available since
130.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 @@
1.\" $OpenBSD: SSL_get_state.3,v 1.2 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_get_state.3,v 1.3 2018/03/21 08:06:34 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -150,5 +150,8 @@ All these functions may be implemented as macros.
150.Fn SSL_in_init , 150.Fn SSL_in_init ,
151and 151and
152.Fn SSL_is_init_finished 152.Fn SSL_is_init_finished
153appeared before SSLeay 0.8 and have been available since 153appeared before SSLeay 0.8.
154.Fn SSL_get_state
155first appeared in SSLeay 0.9.0.
156These functions have been available since
154.Ox 2.4 . 157.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 @@
1.\" $OpenBSD: SSL_num_renegotiations.3,v 1.3 2017/07/05 11:43:09 schwarze Exp $ 1.\" $OpenBSD: SSL_num_renegotiations.3,v 1.4 2018/03/21 08:06:34 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -14,7 +14,7 @@
14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16.\" 16.\"
17.Dd $Mdocdate: July 5 2017 $ 17.Dd $Mdocdate: March 21 2018 $
18.Dt SSL_NUM_RENEGOTIATIONS 3 18.Dt SSL_NUM_RENEGOTIATIONS 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -69,4 +69,6 @@ All these functions return a number of renegotiations.
69.Xr SSL_renegotiate 3 , 69.Xr SSL_renegotiate 3 ,
70.Xr SSL_write 3 70.Xr SSL_write 3
71.Sh HISTORY 71.Sh HISTORY
72These functions are available in all versions of OpenSSL. 72These functions first appeared in SSLeay 0.9.0
73and have been available since
74.Ox 2.4 .