diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2013-11-13 15:20:22 -0800 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-11-14 01:20:12 +0000 |
| commit | 2911575c6e790541e495927a60121d7546a66962 (patch) | |
| tree | f41125d3a9c716eb9a0f0e33d34930c4c9dd48e2 /apps/s_client.c | |
| parent | afa23c46d966fc3862804612be999d403a755cd7 (diff) | |
| download | openssl-2911575c6e790541e495927a60121d7546a66962.tar.gz | |
Fix compilation with no-nextprotoneg.
PR#3106
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 36edaef01e..1e3bc391b5 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -398,8 +398,8 @@ static void sc_usage(void) BIO_printf(bio_err," -auth_require_reneg - Do not send TLS auth extensions until renegotiation\n"); # ifndef OPENSSL_NO_NEXTPROTONEG BIO_printf(bio_err," -nextprotoneg arg - enable NPN extension, considering named protocols supported (comma-separated list)\n"); - BIO_printf(bio_err," -alpn arg - enable ALPN 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"); #endif BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n"); BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n"); @@ -670,8 +670,8 @@ int MAIN(int argc, char **argv) {NULL,0}; # ifndef OPENSSL_NO_NEXTPROTONEG const char *next_proto_neg_in = NULL; - const char *alpn_in = NULL; # endif + const char *alpn_in = NULL; # define MAX_SI_TYPES 100 unsigned short serverinfo_types[MAX_SI_TYPES]; int serverinfo_types_count = 0; @@ -1035,12 +1035,12 @@ static char *jpake_secret = NULL; if (--argc < 1) goto bad; next_proto_neg_in = *(++argv); } +# endif else if (strcmp(*argv,"-alpn") == 0) { if (--argc < 1) goto bad; alpn_in = *(++argv); } -# endif else if (strcmp(*argv,"-serverinfo") == 0) { char *c; @@ -2351,6 +2351,7 @@ static void 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; @@ -2364,7 +2365,6 @@ static void print_stuff(BIO *bio, SSL *s, int full) else BIO_printf(bio, "No ALPN negotiated\n"); } -# endif #endif { |