[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  f7f0632b01cf16efccb133e395cf115c194bd003 (commit)
      from  10646160125ac1328d892f1dd27f2847892d33c5 (commit)


- Log -----------------------------------------------------------------
commit f7f0632b01cf16efccb133e395cf115c194bd003
Author: David Carlier <devnexen at gmail.com>
Date:   Sat Apr 24 16:13:26 2021 +0100

    BIO_listen: disable setting ipv6_v6only on OpenBSD as it is a read only data and true
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/15015)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/b_sock2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c
index 0446e7fd8d..f13f20148b 100644
--- a/crypto/bio/b_sock2.c
+++ b/crypto/bio/b_sock2.c
@@ -264,7 +264,8 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
         }
     }
 
-# ifdef IPV6_V6ONLY
+  /* On OpenBSD it is always ipv6 only with ipv6 sockets thus read-only */
+# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
     if (BIO_ADDR_family(addr) == AF_INET6) {
         /*
          * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF.