1 files changed, 1 insertions, 17 deletions

diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index 4476852cdb..a079c39b9e 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.10 2014/12/10 15:24:01 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.11 2014/12/14 14:42:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -250,9 +250,7 @@ sc_usage(void)
         BIO_printf(bio_err, " -tlsextdebug      - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err, " -status           - request certificate status from server\n");
         BIO_printf(bio_err, " -no_ticket        - disable use of RFC4507bis session tickets\n");
-#ifndef OPENSSL_NO_NEXTPROTONEG
         BIO_printf(bio_err, " -nextprotoneg arg - enable NPN extension, considering named protocols supported (comma-separated list)\n");
-#endif
         BIO_printf(bio_err, " -alpn arg         - enable ALPN extension, considering named protocols supported (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");
@@ -286,7 +284,6 @@ ssl_servername_cb(SSL * s, int *ad, void *arg)
 char *srtp_profiles = NULL;
 #endif
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
 /* This the context that we pass to next_proto_cb */
 typedef struct tlsextnextprotoctx_st {
         unsigned char *data;
@@ -316,7 +313,6 @@ next_proto_cb(SSL * s, unsigned char **out, unsigned char *outlen, const unsigne
         ctx->status = SSL_select_next_proto(out, outlen, in, inlen, ctx->data, ctx->len);
         return SSL_TLSEXT_ERR_OK;
 }
-#endif                          /* ndef OPENSSL_NO_NEXTPROTONEG */
 
 enum {
         PROTO_OFF = 0,
@@ -372,9 +368,7 @@ s_client_main(int argc, char **argv)
         char *servername = NULL;
         tlsextctx tlsextcbp =
         {NULL, 0};
-#ifndef OPENSSL_NO_NEXTPROTONEG
         const char *next_proto_neg_in = NULL;
-#endif
         const char *alpn_in = NULL;
         char *sess_in = NULL;
         char *sess_out = NULL;
@@ -539,13 +533,11 @@ s_client_main(int argc, char **argv)
                 else if (strcmp(*argv, "-no_ticket") == 0) {
                         off |= SSL_OP_NO_TICKET;
                 }
-#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;
@@ -642,7 +634,6 @@ bad:
                 goto end;
         }
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         next_proto.status = -1;
         if (next_proto_neg_in) {
                 next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);
@@ -652,7 +643,6 @@ bad:
                 }
         } else
                 next_proto.data = NULL;
-#endif
 
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine_id, 1);
@@ -738,10 +728,8 @@ bad:
         if (socket_type == SOCK_DGRAM)
                 SSL_CTX_set_read_ahead(ctx, 1);
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         if (next_proto.data)
                 SSL_CTX_set_next_proto_select_cb(ctx, next_proto_cb, &next_proto);
-#endif
         if (alpn_in) {
                 unsigned short alpn_len;
                 unsigned char *alpn = next_protos_parse(&alpn_len, alpn_in);
@@ -1274,9 +1262,7 @@ end:
                         print_stuff(bio_c_out, con, 1);
                 SSL_free(con);
         }
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         free(next_proto.data);
-#endif
         if (ctx != NULL)
                 SSL_CTX_free(ctx);
         if (cert)
@@ -1430,7 +1416,6 @@ print_stuff(BIO * bio, SSL * s, int full)
         }
 #endif
 
-#if !defined(OPENSSL_NO_NEXTPROTONEG)
         if (next_proto.status != -1) {
                 const unsigned char *proto;
                 unsigned int proto_len;
@@ -1439,7 +1424,6 @@ print_stuff(BIO * bio, SSL * s, int full)
                 BIO_write(bio, proto, proto_len);
                 BIO_write(bio, "\n", 1);
         }
-#endif
         {
                 const unsigned char *proto;
                 unsigned int proto_len;