[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  5f95fbf39987848fc50fc8acf42eb8f4a7ec8666 (commit)
       via  20e6631c73cfc643f57c3219a9c7acf4678e9b84 (commit)
       via  f798c27958cd3e92ee242e206a0074bd2d7423df (commit)
      from  f3fdfbf78c6bfc97abf9c70b03859a28ebf6b66d (commit)


- Log -----------------------------------------------------------------
commit 5f95fbf39987848fc50fc8acf42eb8f4a7ec8666
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Dec 23 17:14:58 2019 +0000

    Temporarily disable the explicit enable-asan build
    
    The explicit enable-asan build fails in the memleak test for unknown
    reasons. Therefore we disable it temporarily to get a green Travis.
    
    Other builds that use -fsanitize=address in Travis seem to pass.
    
    [extended tests]
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10689)

commit 20e6631c73cfc643f57c3219a9c7acf4678e9b84
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Dec 23 14:52:03 2019 +0000

    Temporarily disable some Travis external tests
    
    The pyca-cryptography external test has been failing for a long time.
    It looks like upstream needs to make some changes to adapt to 3.0.
    
    [extended tests]
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10689)

commit f798c27958cd3e92ee242e206a0074bd2d7423df
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Dec 23 14:39:57 2019 +0000

    Don't run test_conf in cross compiled builds
    
    test_conf was failing in travis for mingw builds. We run these on linux
    via wine. However due to line break differences the tests were failing.
    We just skip these in a cross compiled build.
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10689)

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

Summary of changes:
 .travis.yml                 | 10 ++++++----
 test/recipes/04-test_conf.t |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86de07e68a..7256b3bccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,16 +105,18 @@ matrix:
                   packages:
                       - golang-1.10
           compiler: gcc
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests enable-buildtest-c++" BORINGSSL_TESTS="yes" CXX="g++" TESTS=95
+          # External test pyca-cryptography temporarily disabled due to long term travis failures
+          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests enable-buildtest-c++" BORINGSSL_TESTS="yes" CXX="g++" TESTS="test_external_boringssl test_external_krb5"
         - os: linux
           compiler: clang
           env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan disable-afalgeng -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
         - os: linux
           compiler: clang
           env:  EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg no-shared enable-buildtest-c++ -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" CXX="clang++"
-        - os: linux
-          compiler: clang
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
+#Temporarily removed because memleak test fails for unknown reasons in this build. Other builds with memleak testing ("-fsanitize=address") are passing.
+#        - os: linux
+#          compiler: clang
+#          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
         - os: linux
           compiler: gcc
           env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 enable-buildtest-c++ -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
diff --git a/test/recipes/04-test_conf.t b/test/recipes/04-test_conf.t
index c28bcb1706..9103cbc8eb 100644
--- a/test/recipes/04-test_conf.t
+++ b/test/recipes/04-test_conf.t
@@ -10,6 +10,7 @@ use strict;
 use warnings;
 
 use OpenSSL::Test qw(:DEFAULT data_file);
+use OpenSSL::Test::Utils;
 use File::Compare qw(compare_text);
 
 setup('test_conf');
@@ -19,6 +20,9 @@ my %input_result = (
     'dollarid_off.conf' => 'dollarid_off.txt',
 );
 
+plan skip_all => 'This is unsupported for cross compiled configurations'
+    if config('CROSS_COMPILE');
+
 plan tests => 2 * scalar(keys %input_result);
 
 foreach (sort keys %input_result) {