diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2013-11-13 15:40:01 -0800 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-11-14 01:20:58 +0000 |
| commit | edc687ba0fa14004a32eafea8856f898113847b5 (patch) | |
| tree | 71719ff291577d5c27e3729a13f7b6df787fcf83 /apps/s_server.c | |
| parent | ff0bdbed85bc8df4a05c34298a03444e215fd05c (diff) | |
Fix compilation with no-nextprotoneg.
PR#3106
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 8fd47c4c3f..8fbe9c5113 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1025,9 +1025,9 @@ int MAIN(int argc, char *argv[]) # 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}; -# endif #endif #ifndef OPENSSL_NO_PSK /* by default do not send a PSK identity hint */ @@ -1477,12 +1477,12 @@ int MAIN(int argc, char *argv[]) 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 #endif #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK) else if (strcmp(*argv,"-jpake") == 0) @@ -2101,8 +2101,10 @@ end: BIO_free(authz_in); if (serverinfo_in != NULL) BIO_free(serverinfo_in); +# ifndef OPENSSL_NO_NEXTPROTONEG if (next_proto.data) OPENSSL_free(next_proto.data); +# endif if (alpn_ctx.data) OPENSSL_free(alpn_ctx.data); #endif |