Fix the no-nextprotoneg option

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

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

apps/s_client.c

@@ -1362,7 +1362,9 @@ int s_client_main(int argc, char **argv)
             }
             break;
         case OPT_NEXTPROTONEG:
+#ifndef OPENSSL_NO_NEXTPROTONEG
             next_proto_neg_in = opt_arg();
+#endif
             break;
         case OPT_ALPN:
             alpn_in = opt_arg();

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:

test/recipes/80-test_ssl_old.t

@@ -568,6 +568,8 @@ sub testssl {
       SKIP: {
 	  skip "TLSv1.0 is not supported by this OpenSSL build", 7
 	      if $no_tls1;
+	  skip "Next Protocol Negotiation is not supported by this OpenSSL build", 7
+	      if disabled("nextprotoneg");
 
 	  ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_client"])));
 	  ok(run(test([@ssltest, "-bio_pair", "-tls1", "-npn_server"])));

test/ssltest_old.c

@@ -2348,7 +2348,9 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
         goto err;
     }
 
+# ifndef OPENSSL_NO_NEXTPROTONEG
  end:
+# endif
     ret = 0;
 
  err:
@@ -2729,7 +2731,9 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
         goto err;
     }
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
  end:
+#endif
     ret = 0;
 
  err: