From: Rich Salz <rsalz@openssl.org>
Date: Tue, 27 Sep 2016 13:23:24 +0000 (-0400)
Subject: Add NPN to an SSL3 build
X-Git-Tag: OpenSSL_1_1_1-pre1~3337
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=211bf9f23f51362565445b03e7a97f5e90813959;p=oweals%2Fopenssl.git

Add NPN to an SSL3 build

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

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"