commit b07c703ff6696fc8f886a7b04366af894f491fcd
author J Mohan Rao Arisankala <mohan@computer.org> Sat Feb 27 08:50:07 2016 +0530
committer Rich Salz <rsalz@openssl.org> Sat Feb 27 17:41:34 2016 -0500
tree 31f1bb0921cb933ed6769cff0185ecc013ba05c6
parent b37d6abf8c804c48767813eef59c00b464b51115

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>

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index c28aa51..5ca1c5f 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -987,9 +987,9 @@
 #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 @@
         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;