summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/man/SSL_COMP_add_compression_method.38
-rw-r--r--src/lib/libssl/man/SSL_CTX_new.311
-rw-r--r--src/lib/libssl/man/SSL_SESSION_get_id.38
-rw-r--r--src/lib/libssl/man/SSL_set_tmp_ecdh.312
4 files changed, 31 insertions, 8 deletions
diff --git a/src/lib/libssl/man/SSL_COMP_add_compression_method.3 b/src/lib/libssl/man/SSL_COMP_add_compression_method.3
index 9e1bd1db7c..e5421852d2 100644
--- a/src/lib/libssl/man/SSL_COMP_add_compression_method.3
+++ b/src/lib/libssl/man/SSL_COMP_add_compression_method.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.3 2018/03/21 16:12:41 schwarze Exp $ 1.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.4 2018/03/23 00:10:28 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: March 21 2018 $ 17.Dd $Mdocdate: March 23 2018 $
18.Dt SSL_COMP_ADD_COMPRESSION_METHOD 3 18.Dt SSL_COMP_ADD_COMPRESSION_METHOD 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -50,3 +50,7 @@ always returns
50.Fn SSL_COMP_add_compression_method 50.Fn SSL_COMP_add_compression_method
51first appeared in OpenSSL 0.9.2b and has been available since 51first appeared in OpenSSL 0.9.2b and has been available since
52.Ox 2.6 . 52.Ox 2.6 .
53.Pp
54.Fn SSL_COMP_get_compression_methods
55first appeared in OpenSSL 0.9.8 and has been available since
56.Ox 4.5 .
diff --git a/src/lib/libssl/man/SSL_CTX_new.3 b/src/lib/libssl/man/SSL_CTX_new.3
index 8f1ab4d00a..85405a7c85 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.6 2018/03/21 08:06:34 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_new.3,v 1.7 2018/03/23 00:10:28 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.\"
@@ -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_NEW 3 54.Dt SSL_CTX_NEW 3
55.Os 55.Os
56.Sh NAME 56.Sh NAME
@@ -252,3 +252,10 @@ and
252first appeared in SSLeay 0.9.0. 252first appeared in SSLeay 0.9.0.
253All these functions have been available since 253All these functions have been available since
254.Ox 2.4 . 254.Ox 2.4 .
255.Pp
256.Fn DTLSv1_method ,
257.Fn DTLSv1_server_method ,
258and
259.Fn DTLSv1_client_method
260first appeared in OpenSSL 0.9.8 and have been available since
261.Ox 4.5 .
diff --git a/src/lib/libssl/man/SSL_SESSION_get_id.3 b/src/lib/libssl/man/SSL_SESSION_get_id.3
index 7d2549e234..ddcd3f30b7 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 @@
1.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.4 2018/03/20 16:37:00 schwarze Exp $ 1.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.5 2018/03/23 00:10:28 schwarze Exp $
2.\" full merge up to: 2.\" full merge up to:
3.\" OpenSSL SSL_SESSION_set1_id 17b60280 Dec 21 09:08:25 2017 +0100 3.\" OpenSSL SSL_SESSION_set1_id 17b60280 Dec 21 09:08:25 2017 +0100
4.\" 4.\"
@@ -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 20 2018 $ 53.Dd $Mdocdate: March 23 2018 $
54.Dt SSL_SESSION_GET_ID 3 54.Dt SSL_SESSION_GET_ID 3
55.Os 55.Os
56.Sh NAME 56.Sh NAME
@@ -103,5 +103,9 @@ for example if the supplied session ID length exceeds
103.Xr SSL_SESSION_has_ticket 3 , 103.Xr SSL_SESSION_has_ticket 3 ,
104.Xr SSL_SESSION_new 3 104.Xr SSL_SESSION_new 3
105.Sh HISTORY 105.Sh HISTORY
106.Fn SSL_SESSION_get_id
107first appeared in OpenSSL 0.9.8 and has been available since
108.Ox 4.5 .
109.Pp
106.Fn SSL_SESSION_set1_id 110.Fn SSL_SESSION_set1_id
107first appeared in OpenSSL 1.1.0. 111first appeared in OpenSSL 1.1.0.
diff --git a/src/lib/libssl/man/SSL_set_tmp_ecdh.3 b/src/lib/libssl/man/SSL_set_tmp_ecdh.3
index 634bbf3c62..9715a287eb 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 @@
1.\" $OpenBSD: SSL_set_tmp_ecdh.3,v 1.3 2017/08/19 23:47:33 schwarze Exp $ 1.\" $OpenBSD: SSL_set_tmp_ecdh.3,v 1.4 2018/03/23 00:10:28 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2017 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: August 19 2017 $ 17.Dd $Mdocdate: March 23 2018 $
18.Dt SSL_SET_TMP_ECDH 3 18.Dt SSL_SET_TMP_ECDH 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -103,3 +103,11 @@ always return 1.
103.Xr SSL_CTX_set_options 3 , 103.Xr SSL_CTX_set_options 3 ,
104.Xr SSL_CTX_set_tmp_dh_callback 3 , 104.Xr SSL_CTX_set_tmp_dh_callback 3 ,
105.Xr SSL_new 3 105.Xr SSL_new 3
106.Sh HISTORY
107.Fn SSL_set_tmp_ecdh ,
108.Fn SSL_CTX_set_tmp_ecdh ,
109.Fn SSL_set_tmp_ecdh_callback ,
110and
111.Fn SSL_CTX_set_tmp_ecdh_callback
112first appeared in OpenSSL 0.9.8 and have been available since
113.Ox 4.5 .