diff options
author | schwarze <> | 2020-09-18 15:39:37 +0000 |
---|---|---|
committer | schwarze <> | 2020-09-18 15:39:37 +0000 |
commit | fba76a3645753641e00c78f5e5f52e3c86bd1426 (patch) | |
tree | 295e380db38c57005d1f50f7282fd598ab988429 | |
parent | 37220aa8abc8c229561e08b8e6f816b43bcf0bb3 (diff) | |
download | openbsd-fba76a3645753641e00c78f5e5f52e3c86bd1426.tar.gz openbsd-fba76a3645753641e00c78f5e5f52e3c86bd1426.tar.bz2 openbsd-fba76a3645753641e00c78f5e5f52e3c86bd1426.zip |
add forgotten link to newish page SSL_set1_host(3)
and update merge notice
-rw-r--r-- | src/lib/libssl/man/ssl.3 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/man/ssl.3 b/src/lib/libssl/man/ssl.3 index 6e7914c8b4..0833a52f86 100644 --- a/src/lib/libssl/man/ssl.3 +++ b/src/lib/libssl/man/ssl.3 | |||
@@ -1,6 +1,6 @@ | |||
1 | .\" $OpenBSD: ssl.3,v 1.17 2019/06/14 13:41:31 schwarze Exp $ | 1 | .\" $OpenBSD: ssl.3,v 1.18 2020/09/18 15:39:37 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 | 2 | .\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 |
3 | .\" selective merge up to: OpenSSL cbade361 Dec 12 13:14:45 2017 +0100 | 3 | .\" selective merge up to: OpenSSL 322755cc Sep 1 08:40:51 2018 +0800 |
4 | .\" | 4 | .\" |
5 | .\" This file was written by Ralf S. Engelschall <rse@openssl.org>, | 5 | .\" This file was written by Ralf S. Engelschall <rse@openssl.org>, |
6 | .\" Ben Laurie <ben@openssl.org>, and Ulf Moeller <ulf@openssl.org>. | 6 | .\" Ben Laurie <ben@openssl.org>, and Ulf Moeller <ulf@openssl.org>. |
@@ -51,7 +51,7 @@ | |||
51 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 51 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
52 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 52 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
53 | .\" | 53 | .\" |
54 | .Dd $Mdocdate: June 14 2019 $ | 54 | .Dd $Mdocdate: September 18 2020 $ |
55 | .Dt SSL 3 | 55 | .Dt SSL 3 |
56 | .Os | 56 | .Os |
57 | .Sh NAME | 57 | .Sh NAME |
@@ -300,6 +300,7 @@ To change the configuration: | |||
300 | .Xr SSL_set_connect_state 3 , | 300 | .Xr SSL_set_connect_state 3 , |
301 | .Xr SSL_set_fd 3 , | 301 | .Xr SSL_set_fd 3 , |
302 | .Xr SSL_set_session 3 , | 302 | .Xr SSL_set_session 3 , |
303 | .Xr SSL_set1_host.3 , | ||
303 | .Xr SSL_set_verify_result 3 | 304 | .Xr SSL_set_verify_result 3 |
304 | .Pp | 305 | .Pp |
305 | To inspect the configuration: | 306 | To inspect the configuration: |