[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dad886806f8bbf7fa0e82776e2ea8a23733b9a63 (commit)
      from  c1c1783d45a5e91951e6328a820939d0256c841c (commit)


- Log -----------------------------------------------------------------
commit dad886806f8bbf7fa0e82776e2ea8a23733b9a63
Author: Todd Short <tshort at akamai.com>
Date:   Mon May 14 10:41:06 2018 -0400

    Fix no-srtp build warnings
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6255)

-----------------------------------------------------------------------

Summary of changes:
 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 96f9da6..5934236 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 5d53250..6180617 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();