From: J Mohan Rao Arisankala <mohan@computer.org>
Date: Sat, 27 Feb 2016 03:20:07 +0000 (+0530)
Subject: fix build with no-srtp
X-Git-Tag: OpenSSL_1_1_0-pre4~472
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b07c703ff6696fc8f886a7b04366af894f491fcd;p=oweals%2Fopenssl.git

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

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;