Fix build with no-nextprotoneg
authorDirk Feytons <dirk.feytons@gmail.com>
Thu, 22 Sep 2016 14:17:45 +0000 (16:17 +0200)
committerDirk Feytons <dirk.feytons@gmail.com>
Thu, 22 Sep 2016 14:17:45 +0000 (16:17 +0200)
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)

ssl/t1_ext.c

index 724ddf76acb3df61dc1de476ea398f72375660f0..79ed946a514226f56800ce4e2ff5828c1d474ef7 100644 (file)
@@ -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: