Install the new page SSL_set1_host(3), link to it from relevant places,

and add two other .Xrs that might help readers find their way.
Update the merge notices of all files touched and
merge a few trivial changes from the OpenSSL 1.1.1 branch.
OK tb@

4 files changed, 17 insertions, 12 deletions

diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile
index 4c3157bd950..0ea04a30775 100644
--- a/lib/libssl/man/Makefile
+++ b/lib/libssl/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2019/04/05 18:29:43 schwarze Exp $
+# $OpenBSD: Makefile,v 1.67 2020/09/17 08:04:22 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -102,6 +102,7 @@ MAN =	BIO_f_ssl.3 \
 	SSL_renegotiate.3 \
 	SSL_rstate_string.3 \
 	SSL_session_reused.3 \
+	SSL_set1_host.3 \
 	SSL_set1_param.3 \
 	SSL_set_bio.3 \
 	SSL_set_connect_state.3 \
diff --git a/lib/libssl/man/SSL_CTX_set_verify.3 b/lib/libssl/man/SSL_CTX_set_verify.3
index 40a09de902a..5b137358ab2 100644
--- a/lib/libssl/man/SSL_CTX_set_verify.3
+++ b/lib/libssl/man/SSL_CTX_set_verify.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: SSL_CTX_set_verify.3,v 1.7 2018/03/27 17:35:50 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_verify.3,v 1.8 2020/09/17 08:04:22 schwarze Exp $
 .\" full merge up to: OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
-.\" selective merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" selective merge up to: OpenSSL 1cb7eff4 Sep 10 13:56:40 2019 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
 .\" Copyright (c) 2000, 2001, 2002, 2003, 2014 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: March 27 2018 $
+.Dd $Mdocdate: September 17 2020 $
 .Dt SSL_CTX_SET_VERIFY 3
 .Os
 .Sh NAME
@@ -443,7 +443,8 @@ if (peer = SSL_get_peer_certificate(ssl)) {
 .Xr SSL_get_ex_new_index 3 ,
 .Xr SSL_get_peer_certificate 3 ,
 .Xr SSL_get_verify_result 3 ,
-.Xr SSL_new 3
+.Xr SSL_new 3 ,
+.Xr SSL_set1_host 3
 .Sh HISTORY
 .Fn SSL_set_verify
 appeared in SSLeay 0.4 or earlier.
diff --git a/lib/libssl/man/SSL_get_peer_certificate.3 b/lib/libssl/man/SSL_get_peer_certificate.3
index 5e7247f4d17..358026d396e 100644
--- a/lib/libssl/man/SSL_get_peer_certificate.3
+++ b/lib/libssl/man/SSL_get_peer_certificate.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: SSL_get_peer_certificate.3,v 1.4 2018/03/27 17:35:50 schwarze Exp $
-.\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" $OpenBSD: SSL_get_peer_certificate.3,v 1.5 2020/09/17 08:04:22 schwarze Exp $
+.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
 .\" Copyright (c) 2000, 2001, 2005 The OpenSSL Project.  All rights reserved.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: September 17 2020 $
 .Dt SSL_GET_PEER_CERTIFICATE 3
 .Os
 .Sh NAME
@@ -97,7 +97,8 @@ The return value points to the certificate presented by the peer.
 .Sh SEE ALSO
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_verify 3 ,
-.Xr SSL_get_verify_result 3
+.Xr SSL_get_verify_result 3 ,
+.Xr SSL_get0_peername 3
 .Sh HISTORY
 .Fn SSL_get_peer_certificate
 appeared in SSLeay 0.4 or earlier and has been available since
diff --git a/lib/libssl/man/SSL_get_verify_result.3 b/lib/libssl/man/SSL_get_verify_result.3
index ec4df2d38e0..03c4210084e 100644
--- a/lib/libssl/man/SSL_get_verify_result.3
+++ b/lib/libssl/man/SSL_get_verify_result.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: SSL_get_verify_result.3,v 1.4 2018/03/27 17:35:50 schwarze Exp $
-.\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" $OpenBSD: SSL_get_verify_result.3,v 1.5 2020/09/17 08:04:22 schwarze Exp $
+.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
 .\" Copyright (c) 2000, 2001, 2005 The OpenSSL Project.  All rights reserved.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: September 17 2020 $
 .Dt SSL_GET_VERIFY_RESULT 3
 .Os
 .Sh NAME
@@ -84,7 +84,9 @@ Documented in
 .Sh SEE ALSO
 .Xr openssl 1 ,
 .Xr ssl 3 ,
+.Xr SSL_CTX_set_verify 3 ,
 .Xr SSL_get_peer_certificate 3 ,
+.Xr SSL_get0_peername 3 ,
 .Xr SSL_set_verify_result 3
 .Sh HISTORY
 .Fn SSL_get_verify_result