Fix the no-nextprotoneg option
Misc fixes to get no-nextprotoneg config option working again.
Reviewed-by: Rich Salz <rsalz@openssl.org>
diff --git a/apps/s_client.c b/apps/s_client.c
index b2f10c8..d658e04 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1362,7 +1362,9 @@
}
break;
case OPT_NEXTPROTONEG:
+#ifndef OPENSSL_NO_NEXTPROTONEG
next_proto_neg_in = opt_arg();
+#endif
break;
case OPT_ALPN:
alpn_in = opt_arg();
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:
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 13fcfbe..67564e7 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -568,6 +568,8 @@
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"])));
diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 2cc25db..0dae90f 100644
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -2348,7 +2348,9 @@
goto err;
}
+# ifndef OPENSSL_NO_NEXTPROTONEG
end:
+# endif
ret = 0;
err:
@@ -2729,7 +2731,9 @@
goto err;
}
+#ifndef OPENSSL_NO_NEXTPROTONEG
end:
+#endif
ret = 0;
err:
