[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  211bf9f23f51362565445b03e7a97f5e90813959 (commit)
      from  ace05265d2d599e350cf84ed60955b7f2b173bc9 (commit)


- Log -----------------------------------------------------------------
commit 211bf9f23f51362565445b03e7a97f5e90813959
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Sep 27 09:23:24 2016 -0400

    Add NPN to an SSL3 build
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1629)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"