commit 1595ca029cbc1f76971843d89ed06b6ffbf17c84
author Matt Caswell <matt@openssl.org> Mon Apr 11 11:41:19 2016 +0100
committer Matt Caswell <matt@openssl.org> Mon Apr 11 14:22:43 2016 +0100
tree 73fc2ea13d48087fdffaa67d01f46a1809bb73c2
parent 2d897ae4d8af83d7920ac4c52d0cab32739d671b

Fix the no-nextprotoneg option

Misc fixes to get no-nextprotoneg config option working again.

Reviewed-by: Rich Salz <rsalz@openssl.org>

ssl/t1_ext.c

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index e993397..3bbe1fd 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -293,7 +293,9 @@
     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: