From d8cdb08fe9952220ce58acb2d6ff75edb3847db2 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 11:54:47 +0800 Subject: [PATCH 01/18] add tri --- .travis.yml | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..cb08e40d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,216 @@ +dist: trusty +sudo: required + +language: c +cache: ccache +git: + submodules: false + +before_install: + - if [ -n "$COVERALLS" ]; then + pip install --user cpp-coveralls; + fi; + - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then + git submodule update --init --recursive; + fi; + +addons: + apt: + packages: + - ccache + - golang-1.6 + +os: + - linux + +compiler: + - clang + - gcc + +env: + - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" + +matrix: + include: + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + 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 + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: x86_64-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + exclude: + - os: linux + compiler: clang + - os: osx + compiler: gcc + +before_script: + - env + - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then + (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; + fi + - if [ -n "$DESTDIR" ]; then + sh .travis-create-release.sh $TRAVIS_OS_NAME; + tar -xvzf _srcdist.tar.gz; + mkdir _build; + cd _build; + srcdir=../_srcdist; + top=..; + else + srcdir=.; + top=.; + fi + - if [ "$CC" == i686-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + else + if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then + CC="ccache $CC"; + fi; + $srcdir/config -v $CONFIG_OPTS; + fi + - cd $top + +script: + - if [ -z "$BUILDONLY" ]; then + make="make -s"; + else + make="make"; + fi + - top=${PWD} + - if [ -n "$DESTDIR" ]; then + cd _build; + fi + - $make update + - if [ -n "$CHECKDOCS" ]; then + $make doc-nits; + fi + - $make + - if [ -z "$BUILDONLY" ]; then + if [ -n "$CROSS_COMPILE" ]; then + sudo dpkg --add-architecture i386; + sudo apt-get update; + sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; + export EXE_SHELL="wine" WINEPREFIX=`pwd`; + fi; + HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; + else + $make build_tests; + fi + - if [ -n "$DESTDIR" ]; then + mkdir "$top/$DESTDIR"; + $make install install_docs DESTDIR="$top/$DESTDIR"; + fi + - cd $top + +after_success: + - if [ -n "$COVERALLS" ]; then + coveralls -b . --gcov gcov-5 --gcov-options '\-lp'; + fi; + +notifications: + email: + secure: "xeGNgWO7aoaDgRvcZubposqMsj36aU8c6F0oHfw+rUqltCQ14IgYCUwzocmR2O+Pa7B3Cx5VjMfBFHbQaajZsfod8vu7g+aGq/zkjwbhsr/SR4dljJjFJXLGZjIalm9KgP6KInmVDuINfCqP+MHIY5lZkNI7DMcyHDhVc5nSKvCXV7xTDNgmstvh8rB/z51WfHDqGqfBtiuK5FDNxmvYK8OFJ5W94Lu9LDlizcxwK3GAj7arOui7Z5w8bQ6p4seUE3IvJL1Zbj0pZHxvNb6Zeb2Pn8QF1qLlN8YmBktD4aiw0ce4wYRiL87uLgcOxZY7SVXtv2XYFIYWapU/FKjCqa6vK93V/H9eZWEIYNMKnN3wXm2beqVdnKek3OeGJ8v0y7MbSfuLfRtBqbTSNYnpU1Zuo4MQAvHvEPuwCAYkYQajOSRplMH5sULFKptuVqNtOMfjL8jHb8AEoL1acYIk43ydxeYrzzas4fqgCDJ52573/u0RNdF1lkQBLkuM365OB8VRqtpnoxcdEIY/qBc/8TzZ24fxyrs5qdHFcxGSgpN2EP6cJMqpvkemnCNSdhxUqfzm22N7a3O8+4LFSBGOnHto/PwdsvF/01yGYL0LoZTnoO1i6x7AMJPBh+eyDU0ZjGhj/msjmqeb9C8vRqQ+1WjHrIS1iqCD0Czib8tUPD4=" From 7d84689e78e19ce3139dd6eb2b561418d9b23943 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 12:09:20 +0800 Subject: [PATCH 02/18] Update .travis.yml --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb08e40d..0b735b05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,11 +27,6 @@ compiler: - clang - gcc -env: - - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" - matrix: include: - os: linux From e3baeb92b0700eb4977f3d72eb58fb91842c7857 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 12:15:29 +0800 Subject: [PATCH 03/18] Update .travis.yml --- .travis.yml | 177 +--------------------------------------------------- 1 file changed, 1 insertion(+), 176 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b735b05..e2117988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,185 +27,10 @@ compiler: - clang - gcc -matrix: - include: - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - 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 - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: x86_64-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - exclude: - - os: linux - compiler: clang - - os: osx - compiler: gcc before_script: - - env - - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then - (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; - fi - - if [ -n "$DESTDIR" ]; then - sh .travis-create-release.sh $TRAVIS_OS_NAME; - tar -xvzf _srcdist.tar.gz; - mkdir _build; - cd _build; - srcdir=../_srcdist; - top=..; - else - srcdir=.; - top=.; - fi - - if [ "$CC" == i686-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; - elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; - else - if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then - CC="ccache $CC"; - fi; - $srcdir/config -v $CONFIG_OPTS; - fi - - cd $top + - ./configu script: - - if [ -z "$BUILDONLY" ]; then - make="make -s"; - else - make="make"; - fi - - top=${PWD} - - if [ -n "$DESTDIR" ]; then - cd _build; - fi - - $make update - - if [ -n "$CHECKDOCS" ]; then - $make doc-nits; - fi - $make - - if [ -z "$BUILDONLY" ]; then - if [ -n "$CROSS_COMPILE" ]; then - sudo dpkg --add-architecture i386; - sudo apt-get update; - sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; - export EXE_SHELL="wine" WINEPREFIX=`pwd`; - fi; - HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; - else - $make build_tests; - fi - - if [ -n "$DESTDIR" ]; then - mkdir "$top/$DESTDIR"; - $make install install_docs DESTDIR="$top/$DESTDIR"; - fi - - cd $top -after_success: - - if [ -n "$COVERALLS" ]; then - coveralls -b . --gcov gcov-5 --gcov-options '\-lp'; - fi; - -notifications: - email: - secure: "xeGNgWO7aoaDgRvcZubposqMsj36aU8c6F0oHfw+rUqltCQ14IgYCUwzocmR2O+Pa7B3Cx5VjMfBFHbQaajZsfod8vu7g+aGq/zkjwbhsr/SR4dljJjFJXLGZjIalm9KgP6KInmVDuINfCqP+MHIY5lZkNI7DMcyHDhVc5nSKvCXV7xTDNgmstvh8rB/z51WfHDqGqfBtiuK5FDNxmvYK8OFJ5W94Lu9LDlizcxwK3GAj7arOui7Z5w8bQ6p4seUE3IvJL1Zbj0pZHxvNb6Zeb2Pn8QF1qLlN8YmBktD4aiw0ce4wYRiL87uLgcOxZY7SVXtv2XYFIYWapU/FKjCqa6vK93V/H9eZWEIYNMKnN3wXm2beqVdnKek3OeGJ8v0y7MbSfuLfRtBqbTSNYnpU1Zuo4MQAvHvEPuwCAYkYQajOSRplMH5sULFKptuVqNtOMfjL8jHb8AEoL1acYIk43ydxeYrzzas4fqgCDJ52573/u0RNdF1lkQBLkuM365OB8VRqtpnoxcdEIY/qBc/8TzZ24fxyrs5qdHFcxGSgpN2EP6cJMqpvkemnCNSdhxUqfzm22N7a3O8+4LFSBGOnHto/PwdsvF/01yGYL0LoZTnoO1i6x7AMJPBh+eyDU0ZjGhj/msjmqeb9C8vRqQ+1WjHrIS1iqCD0Czib8tUPD4=" From 21b36924d38cc11adc2b147b6a19a933eb65cc08 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 12:17:39 +0800 Subject: [PATCH 04/18] Update .travis.yml --- .travis.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2117988..beea2043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,6 @@ cache: ccache git: submodules: false -before_install: - - if [ -n "$COVERALLS" ]; then - pip install --user cpp-coveralls; - fi; - - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then - git submodule update --init --recursive; - fi; - -addons: - apt: - packages: - - ccache - - golang-1.6 - os: - linux @@ -29,7 +15,7 @@ compiler: before_script: - - ./configu + - ./config script: - $make From fbce8954bcd02d2f391fc5f113e1c59a5b3e384e Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 12:21:13 +0800 Subject: [PATCH 05/18] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index beea2043..7ee7d8b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ compiler: before_script: + - cd GmSSL - ./config script: From e9bc53907f20abf7cbe5c374ef30cec7ef14598c Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:10:54 +0800 Subject: [PATCH 06/18] Update .travis.yml --- .travis.yml | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ee7d8b5..bd36ce8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,20 @@ cache: ccache git: submodules: false +before_install: + - if [ -n "$COVERALLS" ]; then + pip install --user cpp-coveralls; + fi; + - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then + git submodule update --init --recursive; + fi; + +addons: + apt: + packages: + - ccache + - golang-1.6 + os: - linux @@ -13,11 +27,182 @@ compiler: - clang - gcc +env: + - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" + +matrix: + include: + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + 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 + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: x86_64-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + exclude: + - os: linux + compiler: clang + - os: osx + compiler: gcc before_script: - - cd GmSSL - - ./config + - env + - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then + (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; + fi + - if [ -n "$DESTDIR" ]; then + sh .travis-create-release.sh $TRAVIS_OS_NAME; + tar -xvzf _srcdist.tar.gz; + mkdir _build; + cd _build; + srcdir=../_srcdist; + top=..; + else + srcdir=.; + top=.; + fi + - if [ "$CC" == i686-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + else + if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then + CC="ccache $CC"; + fi; + $srcdir/config -v $CONFIG_OPTS; + fi + - cd $top script: + - if [ -z "$BUILDONLY" ]; then + make="make -s"; + else + make="make"; + fi + - top=${PWD} + - if [ -n "$DESTDIR" ]; then + cd _build; + fi - $make + - if [ -z "$BUILDONLY" ]; then + if [ -n "$CROSS_COMPILE" ]; then + sudo dpkg --add-architecture i386; + sudo apt-get update; + sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; + export EXE_SHELL="wine" WINEPREFIX=`pwd`; + fi; + HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; + else + $make tests; + fi + - if [ -n "$DESTDIR" ]; then + mkdir "$top/$DESTDIR"; + $make install install_docs DESTDIR="$top/$DESTDIR"; + fi + - cd $top +after_success: + - if [ -n "$COVERALLS" ]; then + coveralls -b . --gcov gcov-5 --gcov-options '\-lp'; + fi; From 9f6a22124b52b8f69df56738b1a8d4ce7eea3f96 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:13:46 +0800 Subject: [PATCH 07/18] Update .travis.yml --- .travis.yml | 115 +--------------------------------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd36ce8d..80d82143 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,120 +29,7 @@ compiler: env: - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" - -matrix: - include: - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - 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 - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: x86_64-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - exclude: - - os: linux - compiler: clang - - os: osx - compiler: gcc + - before_script: - env From 7ac41a5ca6e9d4b63e6e0d2570043ece7c5a68cb Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:16:47 +0800 Subject: [PATCH 08/18] Update .travis.yml --- .travis.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80d82143..4831419b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,6 @@ env: before_script: - env - - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then - (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; - fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; tar -xvzf _srcdist.tar.gz; @@ -47,18 +44,6 @@ before_script: srcdir=.; top=.; fi - - if [ "$CC" == i686-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; - elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; - else - if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then - CC="ccache $CC"; - fi; - $srcdir/config -v $CONFIG_OPTS; - fi - cd $top script: @@ -72,17 +57,7 @@ script: cd _build; fi - $make - - if [ -z "$BUILDONLY" ]; then - if [ -n "$CROSS_COMPILE" ]; then - sudo dpkg --add-architecture i386; - sudo apt-get update; - sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; - export EXE_SHELL="wine" WINEPREFIX=`pwd`; - fi; - HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; - else - $make tests; - fi + - $make tests; - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; $make install install_docs DESTDIR="$top/$DESTDIR"; From 2810c1a27522abdf88f83e85f597d1d1ace5885b Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:20:30 +0800 Subject: [PATCH 09/18] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4831419b..22530195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" + - CONFIG_OPTS="" DESTDIR="_install" - before_script: @@ -44,6 +44,7 @@ before_script: srcdir=.; top=.; fi + - $srcdir/config; - cd $top script: From 6eb382f34b8a01b5b428cb7e2c83b7836b885556 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:28:10 +0800 Subject: [PATCH 10/18] Update .travis.yml --- .travis.yml | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22530195..cb08e40d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,127 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" - - + - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" + +matrix: + include: + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + 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 + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - clang-3.9 + sources: + - llvm-toolchain-trusty-3.9 + - ubuntu-toolchain-r-test + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + - os: linux + addons: + apt: + packages: + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: x86_64-w64-mingw32-gcc + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + exclude: + - os: linux + compiler: clang + - os: osx + compiler: gcc before_script: - env + - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then + (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; + fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; tar -xvzf _srcdist.tar.gz; @@ -44,7 +160,18 @@ before_script: srcdir=.; top=.; fi - - $srcdir/config; + - if [ "$CC" == i686-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + else + if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then + CC="ccache $CC"; + fi; + $srcdir/config -v $CONFIG_OPTS; + fi - cd $top script: @@ -57,8 +184,22 @@ script: - if [ -n "$DESTDIR" ]; then cd _build; fi + - $make update + - if [ -n "$CHECKDOCS" ]; then + $make doc-nits; + fi - $make - - $make tests; + - if [ -z "$BUILDONLY" ]; then + if [ -n "$CROSS_COMPILE" ]; then + sudo dpkg --add-architecture i386; + sudo apt-get update; + sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; + export EXE_SHELL="wine" WINEPREFIX=`pwd`; + fi; + HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; + else + $make build_tests; + fi - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; $make install install_docs DESTDIR="$top/$DESTDIR"; @@ -69,3 +210,7 @@ after_success: - if [ -n "$COVERALLS" ]; then coveralls -b . --gcov gcov-5 --gcov-options '\-lp'; fi; + +notifications: + email: + secure: "xeGNgWO7aoaDgRvcZubposqMsj36aU8c6F0oHfw+rUqltCQ14IgYCUwzocmR2O+Pa7B3Cx5VjMfBFHbQaajZsfod8vu7g+aGq/zkjwbhsr/SR4dljJjFJXLGZjIalm9KgP6KInmVDuINfCqP+MHIY5lZkNI7DMcyHDhVc5nSKvCXV7xTDNgmstvh8rB/z51WfHDqGqfBtiuK5FDNxmvYK8OFJ5W94Lu9LDlizcxwK3GAj7arOui7Z5w8bQ6p4seUE3IvJL1Zbj0pZHxvNb6Zeb2Pn8QF1qLlN8YmBktD4aiw0ce4wYRiL87uLgcOxZY7SVXtv2XYFIYWapU/FKjCqa6vK93V/H9eZWEIYNMKnN3wXm2beqVdnKek3OeGJ8v0y7MbSfuLfRtBqbTSNYnpU1Zuo4MQAvHvEPuwCAYkYQajOSRplMH5sULFKptuVqNtOMfjL8jHb8AEoL1acYIk43ydxeYrzzas4fqgCDJ52573/u0RNdF1lkQBLkuM365OB8VRqtpnoxcdEIY/qBc/8TzZ24fxyrs5qdHFcxGSgpN2EP6cJMqpvkemnCNSdhxUqfzm22N7a3O8+4LFSBGOnHto/PwdsvF/01yGYL0LoZTnoO1i6x7AMJPBh+eyDU0ZjGhj/msjmqeb9C8vRqQ+1WjHrIS1iqCD0Czib8tUPD4=" From 6a6cd1d311435d4e3c2d7cba59dcb617742341a5 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:41:09 +0800 Subject: [PATCH 11/18] Update .travis.yml --- .travis.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb08e40d..5d426b92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,18 +160,10 @@ before_script: srcdir=.; top=.; fi - - if [ "$CC" == i686-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; - elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then - export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; - else - if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then + - if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then CC="ccache $CC"; - fi; - $srcdir/config -v $CONFIG_OPTS; - fi + fi; + - $srcdir/config -v $CONFIG_OPTS; - cd $top script: From 48ecb8bfded8dea514cad425939c11636b04d99d Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:47:13 +0800 Subject: [PATCH 12/18] Update .travis.yml --- .travis.yml | 116 +--------------------------------------------------- 1 file changed, 1 insertion(+), 115 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d426b92..00e798df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,121 +28,7 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" - - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" - -matrix: - include: - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - 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 - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - clang-3.9 - sources: - - llvm-toolchain-trusty-3.9 - - ubuntu-toolchain-r-test - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: i686-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - compiler: x86_64-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - exclude: - - os: linux - compiler: clang - - os: osx - compiler: gcc + - CONFIG_OPTS="" DESTDIR="_install" before_script: - env From db12e1177b5d23f7bd67f06a5721abbf81840fc5 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 14:20:33 +0800 Subject: [PATCH 13/18] Update .travis.yml --- .travis.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00e798df..29cecea1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,24 +32,9 @@ env: before_script: - env - - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then - (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; - fi - - if [ -n "$DESTDIR" ]; then - sh .travis-create-release.sh $TRAVIS_OS_NAME; - tar -xvzf _srcdist.tar.gz; - mkdir _build; - cd _build; - srcdir=../_srcdist; - top=..; - else - srcdir=.; - top=.; - fi - - if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then - CC="ccache $CC"; - fi; - - $srcdir/config -v $CONFIG_OPTS; + - pwd + - ls -l + - ../config -v $CONFIG_OPTS; - cd $top script: From c1ce48f18d51e7f62ff8b80006590d2516e6a251 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 14:22:58 +0800 Subject: [PATCH 14/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29cecea1..eb942e97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ before_script: - env - pwd - ls -l - - ../config -v $CONFIG_OPTS; + - ./config -v $CONFIG_OPTS; - cd $top script: From d435ca35dd7e069f21be02951c2b1da3d7aa74ad Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 14:26:33 +0800 Subject: [PATCH 15/18] Update .travis.yml --- .travis.yml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb942e97..c9e25322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ before_script: - pwd - ls -l - ./config -v $CONFIG_OPTS; - - cd $top script: - if [ -z "$BUILDONLY" ]; then @@ -43,30 +42,9 @@ script: else make="make"; fi - - top=${PWD} - - if [ -n "$DESTDIR" ]; then - cd _build; - fi - - $make update - - if [ -n "$CHECKDOCS" ]; then - $make doc-nits; - fi - $make - - if [ -z "$BUILDONLY" ]; then - if [ -n "$CROSS_COMPILE" ]; then - sudo dpkg --add-architecture i386; - sudo apt-get update; - sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; - export EXE_SHELL="wine" WINEPREFIX=`pwd`; - fi; - HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; - else - $make build_tests; - fi - - if [ -n "$DESTDIR" ]; then - mkdir "$top/$DESTDIR"; - $make install install_docs DESTDIR="$top/$DESTDIR"; - fi + - $make test + - $make install - cd $top after_success: From 9dba3c77e9b856d2cdec3a7fe592c6939fec271a Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 14:35:55 +0800 Subject: [PATCH 16/18] Update .travis.yml --- .travis.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9e25322..ec742c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" + - CONFIG_OPTS="no-paillier" DESTDIR="_install" before_script: - env @@ -45,13 +45,5 @@ script: - $make - $make test - $make install - - cd $top -after_success: - - if [ -n "$COVERALLS" ]; then - coveralls -b . --gcov gcov-5 --gcov-options '\-lp'; - fi; -notifications: - email: - secure: "xeGNgWO7aoaDgRvcZubposqMsj36aU8c6F0oHfw+rUqltCQ14IgYCUwzocmR2O+Pa7B3Cx5VjMfBFHbQaajZsfod8vu7g+aGq/zkjwbhsr/SR4dljJjFJXLGZjIalm9KgP6KInmVDuINfCqP+MHIY5lZkNI7DMcyHDhVc5nSKvCXV7xTDNgmstvh8rB/z51WfHDqGqfBtiuK5FDNxmvYK8OFJ5W94Lu9LDlizcxwK3GAj7arOui7Z5w8bQ6p4seUE3IvJL1Zbj0pZHxvNb6Zeb2Pn8QF1qLlN8YmBktD4aiw0ce4wYRiL87uLgcOxZY7SVXtv2XYFIYWapU/FKjCqa6vK93V/H9eZWEIYNMKnN3wXm2beqVdnKek3OeGJ8v0y7MbSfuLfRtBqbTSNYnpU1Zuo4MQAvHvEPuwCAYkYQajOSRplMH5sULFKptuVqNtOMfjL8jHb8AEoL1acYIk43ydxeYrzzas4fqgCDJ52573/u0RNdF1lkQBLkuM365OB8VRqtpnoxcdEIY/qBc/8TzZ24fxyrs5qdHFcxGSgpN2EP6cJMqpvkemnCNSdhxUqfzm22N7a3O8+4LFSBGOnHto/PwdsvF/01yGYL0LoZTnoO1i6x7AMJPBh+eyDU0ZjGhj/msjmqeb9C8vRqQ+1WjHrIS1iqCD0Czib8tUPD4=" From a9aaa03a811303b989b989e3ca37222ecc26c982 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 15:02:43 +0800 Subject: [PATCH 17/18] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ec742c27..30266707 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ script: else make="make"; fi + - $make update - $make - $make test - $make install From 77e9ddea57ffa3d0d763978a49a83a6484ba2782 Mon Sep 17 00:00:00 2001 From: zhaoxiaomeng Date: Fri, 14 Apr 2017 15:43:35 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0libcrypto.num?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/progs.h | 20 +++++++++++++++- util/libcrypto.num | 59 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/apps/progs.h b/apps/progs.h index 51cb7595..e529aa74 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -182,10 +182,12 @@ static FUNCTION functions[] = { { FT_general, "otp", otp_main, otp_options }, #endif { FT_general, "passwd", passwd_main, passwd_options }, -#ifndef OPENSSL_NO_DES +#ifndef OPENSSL_NO_PKCS12 { FT_general, "pkcs12", pkcs12_main, pkcs12_options }, #endif +#ifndef OPENSSL_NO_PKCS7 { FT_general, "pkcs7", pkcs7_main, pkcs7_options }, +#endif { FT_general, "pkcs8", pkcs8_main, pkcs8_options }, { FT_general, "pkey", pkey_main, pkey_options }, { FT_general, "pkeyparam", pkeyparam_main, pkeyparam_options }, @@ -194,7 +196,9 @@ static FUNCTION functions[] = { { FT_general, "rand", rand_main, rand_options }, { FT_general, "rehash", rehash_main, rehash_options }, { FT_general, "req", req_main, req_options }, +#ifndef OPENSSL_NO_RSA { FT_general, "rsa", rsa_main, rsa_options }, +#endif #ifndef OPENSSL_NO_RSA { FT_general, "rsautl", rsautl_main, rsautl_options }, #endif @@ -229,7 +233,9 @@ static FUNCTION functions[] = { #ifndef OPENSSL_NO_MD4 { FT_md, "md4", dgst_main}, #endif +#ifndef OPENSSL_NO_MD5 { FT_md, "md5", dgst_main}, +#endif #ifndef OPENSSL_NO_GOST { FT_md, "gost", dgst_main}, #endif @@ -265,12 +271,24 @@ static FUNCTION functions[] = { #ifndef OPENSSL_NO_SMS4 { FT_cipher, "sms4-cfb", enc_main, enc_options }, #endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-128-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-128-ecb", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-192-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-192-ecb", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-256-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-256-ecb", enc_main, enc_options }, +#endif #ifndef OPENSSL_NO_CAMELLIA { FT_cipher, "camellia-128-cbc", enc_main, enc_options }, #endif diff --git a/util/libcrypto.num b/util/libcrypto.num index 9154397f..960e65b3 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -3549,7 +3549,7 @@ OPENSSL_strlcat 3501 1_1_0 EXIST::FUNCTION: X509_VERIFY_PARAM_new 3502 1_1_0 EXIST::FUNCTION: BIO_ADDR_rawport 3503 1_1_0 EXIST::FUNCTION:SOCK BUF_MEM_grow_clean 3504 1_1_0 EXIST::FUNCTION: -X509_NAME_print_ex_fp 3505 1_1_0 EXIST::FUNCTION:STDIO +X509_NAME_print_ex_fp 3505 1_1_0 NOEXIST::FUNCTION: X509_check_host 3506 1_1_0 EXIST::FUNCTION: PEM_read_ECPKParameters 3507 1_1_0 EXIST::FUNCTION:EC,STDIO X509_ATTRIBUTE_get0_data 3508 1_1_0 EXIST::FUNCTION: @@ -4265,8 +4265,8 @@ i2d_BFPublicParameters 4229 1_1_0d EXIST::FUNCTION: sms4_unwrap_key 4230 1_1_0d EXIST::FUNCTION: sms4_set_encrypt_key 4231 1_1_0d EXIST::FUNCTION: SKF_RSAVerify 4232 1_1_0d EXIST::FUNCTION: -PAILLIER_PUBLIC_KEY_it 4233 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -PAILLIER_PUBLIC_KEY_it 4233 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +PAILLIER_PUBLIC_KEY_it 4233 1_1_0d NOEXIST::FUNCTION: +PAILLIER_PUBLIC_KEY_it 4233 1_1_0d NOEXIST::FUNCTION: sms4_avx2_encrypt_8blocks 4234 1_1_0d EXIST::FUNCTION: SKF_Transmit 4235 1_1_0d EXIST::FUNCTION: SM9Signature_it 4236 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -4324,7 +4324,7 @@ SDF_InternalPublicKeyOperation_RSA 4285 1_1_0d EXIST::FUNCTION: SM2_ENC_PARAMS_new 4286 1_1_0d EXIST::FUNCTION: SKF_PrintDeviceInfo 4287 1_1_0d EXIST::FUNCTION: EC_GROUP_get_type1curve_eta 4288 1_1_0d EXIST::FUNCTION: -d2i_PAILLIER_PUBLIC_KEY 4289 1_1_0d EXIST::FUNCTION: +d2i_PAILLIER_PUBLIC_KEY 4289 1_1_0d NOEXIST::FUNCTION: SM9PrivateKey_new 4290 1_1_0d EXIST::FUNCTION: sm3_hmac 4291 1_1_0d EXIST::FUNCTION: SOF_GetPinRetryCount 4292 1_1_0d EXIST::FUNCTION: @@ -4378,7 +4378,7 @@ SOF_VerifySignedMessage 4338 1_1_0d EXIST::FUNCTION: EC_KEY_METHOD_set_encrypt 4339 1_1_0d EXIST::FUNCTION: SAF_SM2_DecodeEnvelopedData 4340 1_1_0d EXIST::FUNCTION: SDF_HashUpdate 4341 1_1_0d EXIST::FUNCTION: -i2d_PAILLIER_PUBLIC_KEY 4342 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PUBLIC_KEY 4342 1_1_0d NOEXIST::FUNCTION: EC_GROUP_new_type1curve 4343 1_1_0d EXIST::FUNCTION: BN_GFP2_copy 4344 1_1_0d EXIST::FUNCTION: sms4_encrypt_8blocks 4345 1_1_0d EXIST::FUNCTION: @@ -4614,7 +4614,7 @@ i2d_SM9MasterSecret 4569 1_1_0d EXIST::FUNCTION: FFX_encrypt 4570 1_1_0d EXIST::FUNCTION: CPK_MAP_is_valid 4571 1_1_0d EXIST::FUNCTION: SAF_EnumCertificatesFree 4572 1_1_0d EXIST::FUNCTION: -d2i_PAILLIER_PRIVATE_KEY 4573 1_1_0d EXIST::FUNCTION: +d2i_PAILLIER_PRIVATE_KEY 4573 1_1_0d NOEXIST::FUNCTION: SDF_PrintDeviceInfo 4574 1_1_0d EXIST::FUNCTION: RSA_new_from_RSArefPrivateKey 4575 1_1_0d EXIST::FUNCTION: KDF_get_nist_concatenation 4576 1_1_0d EXIST::FUNCTION: @@ -4693,8 +4693,8 @@ ERR_load_PAILLIER_strings 4646 1_1_0d EXIST::FUNCTION: SDF_GenerateKeyPair_RSA 4647 1_1_0d EXIST::FUNCTION: i2d_CPK_PUBLIC_PARAMS_bio 4648 1_1_0d EXIST::FUNCTION: SOF_EncryptFile 4649 1_1_0d EXIST::FUNCTION: -PAILLIER_PRIVATE_KEY_it 4650 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -PAILLIER_PRIVATE_KEY_it 4650 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +PAILLIER_PRIVATE_KEY_it 4650 1_1_0d NOEXIST::FUNCTION: +PAILLIER_PRIVATE_KEY_it 4650 1_1_0d NOEXIST::FUNCTION: ERR_load_BFIBE_strings 4651 1_1_0d EXIST::FUNCTION: SKF_EncryptInit 4652 1_1_0d EXIST::FUNCTION: EC_KEY_set_ECCrefPublicKey 4653 1_1_0d EXIST::FUNCTION: @@ -4756,7 +4756,7 @@ SDF_HashInit 4705 1_1_0d EXIST::FUNCTION: SM2_KAP_prepare 4706 1_1_0d EXIST::FUNCTION: SAF_VerifyCertificateByCrl 4707 1_1_0d EXIST::FUNCTION: ECDSA_SIG_get_ECCSIGNATUREBLOB 4708 1_1_0d EXIST::FUNCTION: -i2d_PAILLIER_PRIVATE_KEY 4709 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PRIVATE_KEY 4709 1_1_0d NOEXIST::FUNCTION: SDF_OpenDevice 4710 1_1_0d EXIST::FUNCTION: SKF_GetContainerType 4711 1_1_0d EXIST::FUNCTION: PAILLIER_generate_key 4712 1_1_0d EXIST::FUNCTION: @@ -4872,3 +4872,44 @@ SOF_CreateTimeStampRequest 4819 1_1_0d EXIST::FUNCTION: BN_GF2P_add 4820 1_1_0d EXIST::FUNCTION: SM2_compute_key 4821 1_1_0d EXIST::FUNCTION: BN_GFP2_add_bn 4822 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PUBKEY_fp 4823 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PaillierPublicKey 4824 1_1_0d EXIST::FUNCTION: +PEM_read_PAILLIER_PUBKEY 4825 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_bio_PAILLIERPrivateKey 4826 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_write_PAILLIERPublicKey 4827 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_PAILLIER_PUBKEY 4828 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +i2d_PaillierPublicKey_fp 4829 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PaillierPublicKey_bio 4830 1_1_0d EXIST::FUNCTION:PAILLIER +EVP_PKEY_get1_PAILLIER 4831 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPrivateKey 4832 1_1_0d EXIST::FUNCTION: +PEM_write_bio_PAILLIER_PUBKEY 4833 1_1_0d EXIST::FUNCTION:PAILLIER +PaillierPublicKey_it 4834 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: +PaillierPublicKey_it 4834 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +i2d_PaillierPrivateKey_fp 4835 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +X509_NAMpaillierE_print_ex_fp 4836 1_1_0d EXIST::FUNCTION:STDIO +PEM_read_bio_PAILLIER_PUBKEY 4837 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PAILLIER_PUBKEY_bio 4838 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPublicKey_fp 4839 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_read_bio_PAILLIERPrivateKey 4840 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PaillierPublicKey 4841 1_1_0d EXIST::FUNCTION: +PEM_read_PAILLIERPrivateKey 4842 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +EVP_PKEY_set1_PAILLIER 4843 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PaillierPrivateKey 4844 1_1_0d EXIST::FUNCTION: +PaillierPrivateKey_it 4845 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: +PaillierPrivateKey_it 4845 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +i2d_PaillierPrivateKey_bio 4846 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPrivateKey_fp 4847 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_bio_PAILLIERPublicKey 4848 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PAILLIER_PUBKEY 4849 1_1_0d EXIST::FUNCTION:PAILLIER +PAILLIER_up_ref 4850 1_1_0d EXIST::FUNCTION: +PEM_read_bio_PAILLIERPublicKey 4851 1_1_0d EXIST::FUNCTION:PAILLIER +SAF_EccSignFile 4852 1_1_0d EXIST::FUNCTION: +i2d_PaillierPublicKey_bio 4853 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PAILLIER_PUBKEY 4854 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PAILLIER_PUBKEY_bio 4855 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_write_PAILLIERPrivateKey 4856 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +SAF_EccVerifySignFile 4857 1_1_0d EXIST::FUNCTION: +d2i_PaillierPrivateKey_bio 4858 1_1_0d EXIST::FUNCTION:PAILLIER +EVP_PKEY_get0_PAILLIER 4859 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_read_PAILLIERPublicKey 4860 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PAILLIER_PUBKEY_fp 4861 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO