summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorschwarze <>2018-03-23 05:50:30 +0000
committerschwarze <>2018-03-23 05:50:30 +0000
commitcbac6d231fc73083182dff4011c02f3e42aeefe3 (patch)
tree6cb5956fb862c081c2d1b5ded2bf0ad78f5da292 /src
parenta34ac62e7699106b7e4726e71660b351dfe9832e (diff)
downloadopenbsd-cbac6d231fc73083182dff4011c02f3e42aeefe3.tar.gz
openbsd-cbac6d231fc73083182dff4011c02f3e42aeefe3.tar.bz2
openbsd-cbac6d231fc73083182dff4011c02f3e42aeefe3.zip
ssl.h HISTORY up to 1.0.1; researched from OpenSSL git
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/man/SSL_CIPHER_get_name.38
-rw-r--r--src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.38
-rw-r--r--src/lib/libssl/man/SSL_CTX_new.312
-rw-r--r--src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.38
-rw-r--r--src/lib/libssl/man/SSL_SESSION_get0_peer.38
-rw-r--r--src/lib/libssl/man/SSL_SESSION_get_compress_id.38
-rw-r--r--src/lib/libssl/man/SSL_SESSION_set1_id_context.310
-rw-r--r--src/lib/libssl/man/SSL_export_keying_material.38
-rw-r--r--src/lib/libssl/man/SSL_renegotiate.38
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 @@
1.\" $OpenBSD: SSL_CIPHER_get_name.3,v 1.6 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_CIPHER_get_name.3,v 1.7 2018/03/23 05:50:30 schwarze Exp $
2.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 2.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
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.\"
@@ -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: March 21 2018 $ 55.Dd $Mdocdate: March 23 2018 $
56.Dt SSL_CIPHER_GET_NAME 3 56.Dt SSL_CIPHER_GET_NAME 3
57.Os 57.Os
58.Sh NAME 58.Sh NAME
@@ -329,6 +329,10 @@ and
329.Fn SSL_CIPHER_description 329.Fn SSL_CIPHER_description
330appeared before SSLeay 0.8 and have been available since 330appeared before SSLeay 0.8 and have been available since
331.Ox 2.4 . 331.Ox 2.4 .
332.Pp
333.Fn SSL_CIPHER_get_id
334first appeared in OpenSSL 1.0.1 and has been available since
335.Ox 5.3 .
332.Sh BUGS 336.Sh BUGS
333If 337If
334.Fn SSL_CIPHER_description 338.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 @@
1.\" $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.4 2018/03/21 09:05:04 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.5 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL f0d6ee6be Feb 15 07:41:42 2002 +0000 2.\" OpenSSL f0d6ee6be Feb 15 07:41:42 2002 +0000
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and
@@ -50,7 +50,7 @@
50.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 50.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
51.\" OF THE POSSIBILITY OF SUCH DAMAGE. 51.\" OF THE POSSIBILITY OF SUCH DAMAGE.
52.\" 52.\"
53.Dd $Mdocdate: March 21 2018 $ 53.Dd $Mdocdate: March 23 2018 $
54.Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3 54.Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3
55.Os 55.Os
56.Sh NAME 56.Sh NAME
@@ -107,6 +107,10 @@ Check out the error stack to find out the reason for failure.
107.Fn SSL_CTX_add_extra_chain_cert 107.Fn SSL_CTX_add_extra_chain_cert
108first appeared in SSLeay 0.9.1 and has been available since 108first appeared in SSLeay 0.9.1 and has been available since
109.Ox 2.6 . 109.Ox 2.6 .
110.Pp
111.Fn SSL_CTX_clear_extra_chain_certs
112first appeared in OpenSSL 1.0.1 and has been available since
113.Ox 5.3 .
110.Sh CAVEATS 114.Sh CAVEATS
111Only one set of extra chain certificates can be specified per 115Only one set of extra chain certificates can be specified per
112.Vt SSL_CTX 116.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 @@
1.\" $OpenBSD: SSL_CTX_new.3,v 1.7 2018/03/23 00:10:28 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_new.3,v 1.8 2018/03/23 05:50:30 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.\"
@@ -259,3 +259,13 @@ and
259.Fn DTLSv1_client_method 259.Fn DTLSv1_client_method
260first appeared in OpenSSL 0.9.8 and have been available since 260first appeared in OpenSSL 0.9.8 and have been available since
261.Ox 4.5 . 261.Ox 4.5 .
262.Pp
263.Fn TLSv1_1_method ,
264.Fn TLSv1_1_server_method ,
265.Fn TLSv1_1_client_method ,
266.Fn TLSv1_2_method ,
267.Fn TLSv1_2_server_method ,
268and
269.Fn TLSv1_2_client_method
270first appeared in OpenSSL 1.0.1 and have been available since
271.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 @@
1.\" $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.5 2017/08/28 17:36:58 jsing Exp $ 1.\" $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.6 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL 87b81496 Apr 19 12:38:27 2017 -0400 2.\" OpenSSL 87b81496 Apr 19 12:38:27 2017 -0400
3.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 3.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
4.\" 4.\"
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: August 28 2017 $ 52.Dd $Mdocdate: March 23 2018 $
53.Dt SSL_CTX_SET_ALPN_SELECT_CB 3 53.Dt SSL_CTX_SET_ALPN_SELECT_CB 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -259,3 +259,7 @@ ALPN protocol not selected.
259.Xr ssl 3 , 259.Xr ssl 3 ,
260.Xr SSL_CTX_set_tlsext_servername_arg 3 , 260.Xr SSL_CTX_set_tlsext_servername_arg 3 ,
261.Xr SSL_CTX_set_tlsext_servername_callback 3 261.Xr SSL_CTX_set_tlsext_servername_callback 3
262.Sh HISTORY
263.Fn SSL_select_next_proto
264first appeared in OpenSSL 1.0.1 and has been available since
265.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 @@
1.\" $OpenBSD: SSL_SESSION_get0_peer.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_get0_peer.3,v 1.2 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL SSL_SESSION_get0_peer.pod b31db505 Mar 24 16:01:50 2017 +0000 2.\" OpenSSL SSL_SESSION_get0_peer.pod b31db505 Mar 24 16:01:50 2017 +0000
3.\" 3.\"
4.\" This file was written by Matt Caswell <matt@openssl.org> 4.\" This file was written by Matt Caswell <matt@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 23 2018 $
52.Dt SSL_SESSION_GET0_PEER 3 52.Dt SSL_SESSION_GET0_PEER 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -74,3 +74,7 @@ has also been called.
74.Xr ssl 3 , 74.Xr ssl 3 ,
75.Xr SSL_get_session 3 , 75.Xr SSL_get_session 3 ,
76.Xr SSL_SESSION_new 3 76.Xr SSL_SESSION_new 3
77.Sh HISTORY
78.Fn SSL_SESSION_get0_peer
79first appeared in OpenSSL 1.0.1 and has been available since
80.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 @@
1.\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.2 2018/02/24 19:24:09 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.3 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017 2.\" OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017
3.\" 3.\"
4.\" This file was written by Matt Caswell <matt@openssl.org> 4.\" This file was written by Matt Caswell <matt@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: February 24 2018 $ 51.Dd $Mdocdate: March 23 2018 $
52.Dt SSL_SESSION_GET_COMPRESS_ID 3 52.Dt SSL_SESSION_GET_COMPRESS_ID 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -72,3 +72,7 @@ which has an id of 1.
72.Xr SSL_SESSION_get_id 3 , 72.Xr SSL_SESSION_get_id 3 ,
73.Xr SSL_SESSION_get_protocol_version 3 , 73.Xr SSL_SESSION_get_protocol_version 3 ,
74.Xr SSL_SESSION_new 3 74.Xr SSL_SESSION_new 3
75.Sh HISTORY
76.Fn SSL_SESSION_get_compress_id
77first appeared in OpenSSL 1.0.1 and has been available since
78.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 @@
1.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.2 2018/03/18 07:57:19 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.3 2018/03/23 05:50:30 schwarze Exp $
2.\" full merge up to: 2.\" full merge up to:
3.\" OpenSSL SSL_SESSION_get0_id_context b31db505 Mar 24 16:01:50 2017 3.\" OpenSSL SSL_SESSION_get0_id_context b31db505 Mar 24 16:01:50 2017
4.\" 4.\"
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: March 18 2018 $ 52.Dd $Mdocdate: March 23 2018 $
53.Dt SSL_SESSION_SET1_ID_CONTEXT 3 53.Dt SSL_SESSION_SET1_ID_CONTEXT 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -104,6 +104,10 @@ returns 1 on success or 0 on error.
104.Xr SSL_get_session 3 , 104.Xr SSL_get_session 3 ,
105.Xr SSL_SESSION_new 3 105.Xr SSL_SESSION_new 3
106.Sh HISTORY 106.Sh HISTORY
107.Fa SSL_SESSION_get0_id_context 107.Fn SSL_SESSION_set1_id_context
108first appeared in OpenSSL 1.0.1 and have been available since
109.Ox 5.3 .
110.Pp
111.Fn SSL_SESSION_get0_id_context
108first appeared in OpenSSL 1.1.0 and has been available since 112first appeared in OpenSSL 1.1.0 and has been available since
109.Ox 6.3 . 113.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 @@
1.\" $OpenBSD: SSL_export_keying_material.3,v 1.1 2017/08/21 10:10:25 schwarze Exp $ 1.\" $OpenBSD: SSL_export_keying_material.3,v 1.2 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL a599574b Jun 28 17:18:27 2017 +0100 2.\" OpenSSL a599574b Jun 28 17:18:27 2017 +0100
3.\" OpenSSL 23cec1f4 Jun 21 13:55:02 2017 +0100 3.\" OpenSSL 23cec1f4 Jun 21 13:55:02 2017 +0100
4.\" 4.\"
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: August 21 2017 $ 52.Dd $Mdocdate: March 23 2018 $
53.Dt SSL_EXPORT_KEYING_MATERIAL 3 53.Dt SSL_EXPORT_KEYING_MATERIAL 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -125,3 +125,7 @@ standard to be used without registration.
125.Sh RETURN VALUES 125.Sh RETURN VALUES
126.Fn SSL_export_keying_material 126.Fn SSL_export_keying_material
127returns 1 on success or 0 or -1 on failure. 127returns 1 on success or 0 or -1 on failure.
128.Sh HISTORY
129.Fn SSL_export_keying_material
130first appeared in OpenSSL 1.0.1 and has been available since
131.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 @@
1.\" $OpenBSD: SSL_renegotiate.3,v 1.6 2018/03/22 21:09:18 schwarze Exp $ 1.\" $OpenBSD: SSL_renegotiate.3,v 1.7 2018/03/23 05:50:30 schwarze Exp $
2.\" OpenSSL SSL_key_update.pod 4fbfe86a Feb 16 17:04:40 2017 +0000 2.\" OpenSSL SSL_key_update.pod 4fbfe86a Feb 16 17:04:40 2017 +0000
3.\" 3.\"
4.\" This file is a derived work. 4.\" This file is a derived work.
@@ -65,7 +65,7 @@
65.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 65.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
66.\" OF THE POSSIBILITY OF SUCH DAMAGE. 66.\" OF THE POSSIBILITY OF SUCH DAMAGE.
67.\" 67.\"
68.Dd $Mdocdate: March 22 2018 $ 68.Dd $Mdocdate: March 23 2018 $
69.Dt SSL_RENEGOTIATE 3 69.Dt SSL_RENEGOTIATE 3
70.Os 70.Os
71.Sh NAME 71.Sh NAME
@@ -159,3 +159,7 @@ appeared before SSLeay 0.8 and has been available since
159.Fn SSL_renegotiate_pending 159.Fn SSL_renegotiate_pending
160first appeared in OpenSSL 0.9.7 and has been available since 160first appeared in OpenSSL 0.9.7 and has been available since
161.Ox 3.2 . 161.Ox 3.2 .
162.Pp
163.Fn SSL_renegotiate_abbreviated
164first appeared in OpenSSL 1.0.1 and has been available since
165.Ox 5.3 .