[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  7cb58c0ffa7203e8ad4d39c912a1ab5e21a12b85 (commit)
       via  2886a69ca51a1bd55889f328ea296eb127b998e6 (commit)
      from  44e58f3b7be54b0a29aad6ca26bd2ae60759d9a3 (commit)


- Log -----------------------------------------------------------------
commit 7cb58c0ffa7203e8ad4d39c912a1ab5e21a12b85
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Dec 3 16:57:04 2016 +0100

    Also set the CXXFLAG to the user supplied flags
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    
    GH: #2025

commit 2886a69ca51a1bd55889f328ea296eb127b998e6
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Dec 3 14:37:16 2016 +0100

    travis: Use no-shared for the FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION targets
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    
    GH: #2025

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

Summary of changes:
 .travis.yml | 6 +++---
 Configure   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb9a5fb..85320ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,16 +42,16 @@ matrix:
           env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
         - os: linux
           compiler: gcc-5
-          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"
+          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="enable-msan"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+          env: 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"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
diff --git a/Configure b/Configure
index 45b4175..896d4d4 100755
--- a/Configure
+++ b/Configure
@@ -1305,7 +1305,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
 		}
 	}
 
-if ($user_cflags ne "") { $config{cflags}="$config{cflags}$user_cflags"; }
+if ($user_cflags ne "") { $config{cflags}="$config{cflags}$user_cflags"; $config{cxxflags}="$config{cxxflags}$user_cflags";}
 else                    { $no_user_cflags=1;  }
 if (@user_defines) { $config{defines}=[ @{$config{defines}}, @user_defines ]; }
 else               { $no_user_defines=1;    }