From: Dirk Feytons <dirk.feytons@gmail.com>
Date: Thu, 22 Sep 2016 14:17:45 +0000 (+0200)
Subject: Fix build with no-nextprotoneg
X-Git-Tag: OpenSSL_1_0_2j~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f15a7e39a1f7d41716ca5f07faef74f55147d2cf;p=oweals%2Fopenssl.git

Fix build with no-nextprotoneg

Add a missing ifdef. Same change is already present in master.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1100)
---

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 724ddf76ac..79ed946a51 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: