Fix the no-nextprotoneg option

Misc fixes to get no-nextprotoneg config option working again. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-04-11 11:41:19 +01:00
parent 2d897ae4d8
commit 1595ca029c
4 changed files with 10 additions and 0 deletions
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -293,7 +293,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: