1 files changed, 1 insertions, 17 deletions

diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 35ed6d169c..fdd93977e8 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.8 2014/12/10 15:24:01 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.9 2014/12/14 14:42:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -348,9 +348,7 @@ sv_usage(void)
         BIO_printf(bio_err, "                 not specified (default is %s)\n", TEST_CERT2);
         BIO_printf(bio_err, " -tlsextdebug  - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err, " -no_ticket    - disable use of RFC4507bis session tickets\n");
-#ifndef OPENSSL_NO_NEXTPROTONEG
         BIO_printf(bio_err, " -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
-#endif
         BIO_printf(bio_err," -alpn arg  - set the advertised protocols for the ALPN extension (comma-separated list)\n");
 #ifndef OPENSSL_NO_SRTP
         BIO_printf(bio_err, " -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
@@ -526,7 +524,6 @@ err:
         goto done;
 }
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
 /* This is the context that we pass to next_proto_cb */
 typedef struct tlsextnextprotoctx_st {
         unsigned char *data;
@@ -543,7 +540,6 @@ next_proto_cb(SSL * s, const unsigned char **data, unsigned int *len, void *arg)
 
         return SSL_TLSEXT_ERR_OK;
 }
-#endif                          /* ndef OPENSSL_NO_NEXTPROTONEG */
 
 
 /* This the context that we pass to alpn_cb */
@@ -621,10 +617,8 @@ s_server_main(int argc, char *argv[])
         EVP_PKEY *s_key2 = NULL;
         X509 *s_cert2 = NULL;
         tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
-#ifndef OPENSSL_NO_NEXTPROTONEG
         const char *next_proto_neg_in = NULL;
         tlsextnextprotoctx next_proto = { NULL, 0 };
-#endif
         const char *alpn_in = NULL;
         tlsextalpnctx alpn_ctx = { NULL, 0 };
         meth = SSLv23_server_method();
@@ -873,13 +867,11 @@ s_server_main(int argc, char *argv[])
                                 goto bad;
                         s_key_file2 = *(++argv);
                 }
-#ifndef OPENSSL_NO_NEXTPROTONEG
                 else if (strcmp(*argv, "-nextprotoneg") == 0) {
                         if (--argc < 1)
                                 goto bad;
                         next_proto_neg_in = *(++argv);
                 }
-#endif
                 else if (strcmp(*argv,"-alpn") == 0) {
                         if (--argc < 1)
                                 goto bad;
@@ -963,7 +955,6 @@ bad:
                         }
                 }
         }
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         if (next_proto_neg_in) {
                 unsigned short len;
                 next_proto.data = next_protos_parse(&len, next_proto_neg_in);
@@ -973,7 +964,6 @@ bad:
         } else {
                 next_proto.data = NULL;
         }
-#endif
         alpn_ctx.data = NULL;
         if (alpn_in) {
                 unsigned short len;
@@ -1125,10 +1115,8 @@ bad:
                 if (vpm)
                         SSL_CTX_set1_param(ctx2, vpm);
         }
-#ifndef OPENSSL_NO_NEXTPROTONEG
         if (next_proto.data)
                 SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb, &next_proto);
-#endif
         if (alpn_ctx.data)
                 SSL_CTX_set_alpn_select_cb(ctx, alpn_cb, &alpn_ctx);
 
@@ -1660,10 +1648,8 @@ init_ssl_connection(SSL * con)
         X509 *peer;
         long verify_error;
         char buf[BUFSIZ];
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         const unsigned char *next_proto_neg;
         unsigned next_proto_neg_len;
-#endif
         unsigned char *exportedkeymat;
 
         i = SSL_accept(con);
@@ -1698,14 +1684,12 @@ init_ssl_connection(SSL * con)
         str = SSL_CIPHER_get_name(SSL_get_current_cipher(con));
         BIO_printf(bio_s_out, "CIPHER is %s\n", (str != NULL) ? str : "(NONE)");
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         SSL_get0_next_proto_negotiated(con, &next_proto_neg, &next_proto_neg_len);
         if (next_proto_neg) {
                 BIO_printf(bio_s_out, "NEXTPROTO is ");
                 BIO_write(bio_s_out, next_proto_neg, next_proto_neg_len);
                 BIO_printf(bio_s_out, "\n");
         }
-#endif
 #ifndef OPENSSL_NO_SRTP
         {
                 SRTP_PROTECTION_PROFILE *srtp_profile