From 877a6c9c2b93b64ddbd43ee096a56151231d08e6 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Mon, 26 Sep 2016 14:30:19 +0000
Subject: MFC:	r306342

Merge OpenSSL 1.0.2j.
---
 crypto/openssl/ssl/t1_ext.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'crypto/openssl/ssl')

diff --git a/crypto/openssl/ssl/t1_ext.c b/crypto/openssl/ssl/t1_ext.c
index 724ddf7..79ed946 100644
--- a/crypto/openssl/ssl/t1_ext.c
+++ b/crypto/openssl/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:
-- 
cgit v1.1