commit dad886806f8bbf7fa0e82776e2ea8a23733b9a63
author Todd Short <tshort@akamai.com> Mon May 14 10:41:06 2018 -0400
committer Richard Levitte <levitte@openssl.org> Sun May 20 10:07:03 2018 +0200
tree c2fe2bc04afc4ae912382a22029affa5a3044120
parent c1c1783d45a5e91951e6328a820939d0256c841c

Fix no-srtp build warnings

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6255)

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 96f9da6..5934236 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -935,7 +935,9 @@
     int srp_lateuser = 0;
     SRP_ARG srp_arg = { NULL, NULL, 0, 0, 0, 1024 };
 #endif
+#ifndef OPENSSL_NO_SRTP
     char *srtp_profiles = NULL;
+#endif
 #ifndef OPENSSL_NO_CT
     char *ctlog_file = NULL;
     int ct_validation = 0;
@@ -1422,7 +1424,9 @@
             noservername = 1;
             break;
         case OPT_USE_SRTP:
+#ifndef OPENSSL_NO_SRTP
             srtp_profiles = opt_arg();
+#endif
             break;
         case OPT_KEYMATEXPORT:
             keymatexportlabel = opt_arg();

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 5d53250..6180617 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1020,7 +1020,9 @@
     char *srpuserseed = NULL;
     char *srp_verifier_file = NULL;
 #endif
+#ifndef OPENSSL_NO_SRTP
     char *srtp_profiles = NULL;
+#endif
     int min_version = 0, max_version = 0, prot_opt = 0, no_prot_opt = 0;
     int s_server_verify = SSL_VERIFY_NONE;
     int s_server_session_id_context = 1; /* anything will do */
@@ -1527,7 +1529,9 @@
             alpn_in = opt_arg();
             break;
         case OPT_SRTP_PROFILES:
+#ifndef OPENSSL_NO_SRTP
             srtp_profiles = opt_arg();
+#endif
             break;
         case OPT_KEYMATEXPORT:
             keymatexportlabel = opt_arg();