Add NPN to an SSL3 build

Reviewed-by: N Emilia Käsper <emilia@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1629)

Add NPN to an SSL3 build
Reviewed-by: N Emilia Käsper <emilia@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1629)
211bf9f2 · Rich Salz · ace05265 · 211bf9f2
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

.travis.yml .travis.yml +2 -2

未找到文件。
--- 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"