generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with no-nextprotoneg.

Browse Source 
PR#3106
This commit is contained in:
Piotr Sikora
2013-11-13 15:40:01 -08:00
committed by Dr. Stephen Henson
parent ff0bdbed85
commit edc687ba0f
8 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/s_server.c
View File

@@ -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