[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  f15a7e39a1f7d41716ca5f07faef74f55147d2cf (commit)
      from  581215a519c66db7255ea360ed25bb00033ccd52 (commit)


- Log -----------------------------------------------------------------
commit f15a7e39a1f7d41716ca5f07faef74f55147d2cf
Author: Dirk Feytons <dirk.feytons at gmail.com>
Date:   Thu Sep 22 16:17:45 2016 +0200

    Fix build with no-nextprotoneg
    
    Add a missing ifdef. Same change is already present in master.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1100)

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

Summary of changes:
 ssl/t1_ext.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 724ddf7..79ed946 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -275,7 +275,9 @@ int SSL_extension_supported(unsigned int ext_type)
     case TLSEXT_TYPE_ec_point_formats:
     case TLSEXT_TYPE_elliptic_curves:
     case TLSEXT_TYPE_heartbeat:
+# ifndef OPENSSL_NO_NEXTPROTONEG
     case TLSEXT_TYPE_next_proto_neg:
+# endif
     case TLSEXT_TYPE_padding:
     case TLSEXT_TYPE_renegotiate:
     case TLSEXT_TYPE_server_name: