diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-09-27 09:23:24 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-10-24 08:09:43 -0400 |
| commit | 211bf9f23f51362565445b03e7a97f5e90813959 (patch) | |
| tree | 33ff2e897c0b1e83b29c10153b7971d24d874f7e /.travis.yml | |
| parent | ace05265d2d599e350cf84ed60955b7f2b173bc9 (diff) | |
| download | openssl-211bf9f23f51362565445b03e7a97f5e90813959.tar.gz | |
Add NPN to an SSL3 build
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1629)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9434f877d6..d044309b29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,13 +37,13 @@ matrix: include: - os: linux compiler: gcc - env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes" + 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" COVERALLS="yes" - 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 -fno-sanitize=alignment" + env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment" - os: linux compiler: clang-3.6 env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2" |