Commit 211bf9f2 authored by Rich Salz's avatar Rich Salz
Browse files

Add NPN to an SSL3 build 



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

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -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"