diff options
| author | Pauli <paul.dale@oracle.com> | 2017-03-28 07:38:09 +1000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-03-28 08:42:22 -0400 |
| commit | 9ff79fa3e12628d4c0c32b5de82a9c2b20fe7402 (patch) | |
| tree | 7db2fcc5815e94d3ef13d7b3399b93d68da14c8d | |
| parent | a0f44a34d2bbf030414de9c0a1eaaaab0b1e62db (diff) | |
| download | openssl-9ff79fa3e12628d4c0c32b5de82a9c2b20fe7402.tar.gz | |
Add enable-aria where rc5 and md2 are built.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3046)
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 662b8b55a6..24214e9bee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +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" 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: @@ -71,7 +71,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: EXTENDED_TEST="yes" 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 no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-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: @@ -101,7 +101,7 @@ matrix: - 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-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + 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: @@ -111,7 +111,7 @@ matrix: - 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 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + 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: @@ -121,7 +121,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" - os: linux addons: apt: |