[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  a602decedb8d91385992d8e50cd1bb4bde111c33 (commit)
       via  9a96626ef478fe8037fc6c8e02f2f05bdf8d5c4e (commit)
      from  781fb90cd7ec28a0d4e94cbb4a95fecb72020c2d (commit)


- Log -----------------------------------------------------------------
commit a602decedb8d91385992d8e50cd1bb4bde111c33
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun May 6 18:36:09 2018 +0200

    .travis.yml: temporarily mask gcc-5 ubsan build.
    
    Linking fails with "unrecognized option '--push-state--no-as-needed'",
    which is beyond our control.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6185)

commit 9a96626ef478fe8037fc6c8e02f2f05bdf8d5c4e
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun May 6 18:30:59 2018 +0200

    .travis.yml: minor facelift
    
    Apparently trusty image has newer clang, there is no need to pull
    clang-3.9 packages. It's clang-5.0.0, installation is a bit quirky,
    as it fails to compile for example strcmp(s,"-") without warning,
    and complains about unreferred -I flags. But it's argued that benefits
    of exercising newer sanitizer outweights the inconvenience of
    additional -D__NO_STRING_INLINE and -Wno-unused-command-line-argument.
    
    Also pull golang when actually needed.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6185)

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

Summary of changes:
 .travis.yml | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33c3751..d5147f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,6 @@ before_install:
           git submodule update --init --recursive;
       fi;
 
-addons:
-    apt:
-        packages:
-            - ccache
-            - golang-1.6
-
 os:
     - linux
     - osx
@@ -48,8 +42,8 @@ matrix:
           compiler: gcc-5
           env: CONFIG_OPTS="--strict-warnings" COMMENT="Move to the BORINGTEST build when interoperable"
         - os: linux
-          compiler: clang-3.9
-          env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
+          compiler: clang
+          env: CONFIG_OPTS="--strict-warnings -D__NO_STRING_INLINES no-deprecated" BUILDONLY="yes"
         - os: linux
           addons:
               apt:
@@ -64,6 +58,7 @@ matrix:
                   packages:
                       - gcc-5
                       - g++-5
+                      - golang-1.6
                   sources:
                       - ubuntu-toolchain-r-test
           compiler: gcc-5
@@ -74,29 +69,30 @@ matrix:
                   packages:
                       - gcc-5
                       - g++-5
+                      - golang-1.6
                   sources:
                       - ubuntu-toolchain-r-test
           compiler: gcc-5
           env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests" BORINGSSL_TESTS="yes" CXX="g++-5" TESTS=95
         - os: linux
-          compiler: clang-3.9
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
-        - os: linux
-          compiler: clang-3.9
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+          compiler: clang
+          env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
         - os: linux
-          compiler: clang-3.9
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+          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 -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
         - os: linux
-          addons:
-              apt:
-                  packages:
-                      - gcc-5
-                      - g++-5
-                  sources:
-                      - ubuntu-toolchain-r-test
-          compiler: gcc-5
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
+          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
+        #  addons:
+        #      apt:
+        #          packages:
+        #              - gcc-5
+        #              - g++-5
+        #          sources:
+        #              - ubuntu-toolchain-r-test
+        #  compiler: gcc-5
+        #  env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
         - os: linux
           addons:
               apt: