aboutsummaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorJ Mohan Rao Arisankala <mohan@computer.org>2016-02-27 08:50:07 +0530
committerRich Salz <rsalz@openssl.org>2016-02-27 17:41:34 -0500
commitb07c703ff6696fc8f886a7b04366af894f491fcd (patch)
tree31f1bb0921cb933ed6769cff0185ecc013ba05c6 /apps/s_server.c
parentb37d6abf8c804c48767813eef59c00b464b51115 (diff)
downloadopenssl-b07c703ff6696fc8f886a7b04366af894f491fcd.tar.gz
fix build with no-srtp
- srtp_profiles variable is defined when building with SRTP, keeping the variable usage also under ifndef OPENSSL_NO_SRTP - alpn help option was kept under ifndef OPENSSL_NO_SRTP Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index c28aa51d40..5ca1c5f1a8 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -987,9 +987,9 @@ OPTIONS s_server_options[] = {
#ifndef OPENSSL_NO_SRTP
{"use_srtp", OPT_SRTP_PROFILES, 's',
"Offer SRTP key management with a colon-separated profile list"},
+#endif
{"alpn", OPT_ALPN, 's',
"Set the advertised protocols for the ALPN extension (comma-separated list)"},
-#endif
#ifndef OPENSSL_NO_ENGINE
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
#endif
@@ -1490,9 +1490,11 @@ int s_server_main(int argc, char *argv[])
case OPT_ALPN:
alpn_in = opt_arg();
break;
+#ifndef OPENSSL_NO_SRTP
case OPT_SRTP_PROFILES:
srtp_profiles = opt_arg();
break;
+#endif
case OPT_KEYMATEXPORT:
keymatexportlabel = opt_arg();
break;