From 211bf9f23f51362565445b03e7a97f5e90813959 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 27 Sep 2016 09:23:24 -0400 Subject: Add NPN to an SSL3 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper (Merged from https://github.com/openssl/openssl/pull/1629) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 9434f87..d044309 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" -- cgit v1.1