From dad886806f8bbf7fa0e82776e2ea8a23733b9a63 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 14 May 2018 10:41:06 -0400 Subject: [PATCH] Fix no-srtp build warnings Reviewed-by: Andy Polyakov Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6255) --- apps/s_client.c | 4 ++++ apps/s_server.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/apps/s_client.c b/apps/s_client.c index 96f9da6985..59342366b9 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -935,7 +935,9 @@ int s_client_main(int argc, char **argv) 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 @@ int s_client_main(int argc, char **argv) noservername = 1; break; case OPT_USE_SRTP: +#ifndef OPENSSL_NO_SRTP srtp_profiles = opt_arg(); +#endif break; case OPT_KEYMATEXPORT: keymatexportlabel = opt_arg(); diff --git a/apps/s_server.c b/apps/s_server.c index 5d53250935..6180617258 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1020,7 +1020,9 @@ int s_server_main(int argc, char *argv[]) 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 @@ int s_server_main(int argc, char *argv[]) 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(); -- 2.25.1