From 9bebdfb70dbdd27578ce9096784aba42674545e3 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Sun, 11 Oct 2020 16:14:38 +0000
Subject: In ssl_methods.c rev. 1.18, jsing@ deprecated *_server_method(3) and
 *_client_method(3).  Adjust the documentation. While here, delete most of the
 verbiage regarding the deprecated functions SSLv23_*(3) and add the missing
 entry to RETURN VALUES. OK tb@

---
 src/lib/libssl/man/SSL_CTX_new.3 | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/man/SSL_CTX_new.3 b/src/lib/libssl/man/SSL_CTX_new.3
index 13b3700240..21f4cf08b2 100644
--- a/src/lib/libssl/man/SSL_CTX_new.3
+++ b/src/lib/libssl/man/SSL_CTX_new.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: SSL_CTX_new.3,v 1.12 2020/06/04 18:06:43 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_new.3,v 1.13 2020/10/11 16:14:38 schwarze Exp $
 .\" full merge up to: OpenSSL 21cd6e00 Oct 21 14:40:15 2015 +0100
-.\" selective merge up to: OpenSSL 1212818e Sep 11 13:22:14 2018 +0100
+.\" selective merge up to: OpenSSL 8f75443f May 24 14:04:26 2019 +0200
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
 .\" Copyright (c) 2000, 2005, 2012, 2013, 2015, 2016 The OpenSSL Project.
@@ -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: June 4 2020 $
+.Dd $Mdocdate: October 11 2020 $
 .Dt SSL_CTX_NEW 3
 .Os
 .Sh NAME
@@ -178,14 +178,8 @@ methods described below.
 .Fn SSLv23_server_method ,
 .Fn SSLv23_client_method
 .Xc
-Use of these functions is deprecated.
-They have been replaced with the above
-.Fn TLS_method ,
-.Fn TLS_server_method ,
-and
-.Fn TLS_client_method ,
-respectively.
-New code should use those functions instead.
+These are deprecated aliases for
+.Fn TLS_method .
 .It Xo
 .Fn TLSv1_method ,
 .Fn TLSv1_server_method ,
@@ -222,6 +216,14 @@ The currently supported protocol is DTLS 1.0.
 These are the version-specific methods for DTLSv1.
 .El
 .Pp
+The methods containing the substrings
+.Dq _server
+or
+.Dq _client
+in their names are deprecated.
+In LibreSSL, they return the same objects
+as the methods without these substrings.
+.Pp
 The list of protocols available can also be limited using the
 .Dv SSL_OP_NO_TLSv1 ,
 .Dv SSL_OP_NO_TLSv1_1 ,
@@ -247,6 +249,11 @@ Check the error stack to find out the reason for failure.
 .Pp
 .Fn SSL_CTX_up_ref
 returns 1 for success or 0 for failure.
+.Pp
+.Fn TLS_method
+and the other
+.Fn *_method
+functions return pointers to constant static objects.
 .Sh SEE ALSO
 .Xr ssl 3 ,
 .Xr SSL_accept 3 ,
-- 
cgit v1.2.3-55-g6feb