[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c44bab084ed139b5e5c3f6b318bf1bf65e04cfa5 (commit)
      from  61f805c1d52358778fd77b239f24b6f64f1e2c6e (commit)


- Log -----------------------------------------------------------------
commit c44bab084ed139b5e5c3f6b318bf1bf65e04cfa5
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 16 19:50:10 2018 +0100

    TLSProxy::Proxy:  If we don't support IPv6, force IPv4
    
    We use the first we can of the following IO::Socket modules to create
    sockets:
    
    - IO::Socket::INET6
    - IO::Socket::IP
    - IO::Socket::INET
    
    The last of them doesn't support IPv6, so if that's the one available,
    we must force the s_client and s_server processes to use IPv4.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/5092)

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

Summary of changes:
 util/perl/TLSProxy/Proxy.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index d778d0e..a87675c 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -167,6 +167,9 @@ sub start
             .($self->server_port)
             ." -cert ".$self->cert." -cert2 ".$self->cert
             ." -naccept ".$self->serverconnects;
+        unless ($self->supports_IPv6) {
+            $execcmd .= " -4";
+        }
         if ($self->ciphers ne "") {
             $execcmd .= " -cipher ".$self->ciphers;
         }
@@ -228,6 +231,9 @@ sub clientstart
             my $execcmd = "echo ".$echostr." | ".$self->execute
                  ." s_client -engine ossltest -connect "
                  .($self->proxy_addr).":".($self->proxy_port);
+            unless ($self->supports_IPv6) {
+                $execcmd .= " -4";
+            }
             if ($self->cipherc ne "") {
                 $execcmd .= " -cipher ".$self->cipherc;
             }