[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d631602533d2e06f9a7a7645ee66638190e0db54 (commit)
       via  b07c703ff6696fc8f886a7b04366af894f491fcd (commit)
      from  b37d6abf8c804c48767813eef59c00b464b51115 (commit)


- Log -----------------------------------------------------------------
commit d631602533d2e06f9a7a7645ee66638190e0db54
Author: J Mohan Rao Arisankala <mohan at computer.org>
Date:   Sat Feb 27 09:05:51 2016 +0530

    using macro inside the case.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b07c703ff6696fc8f886a7b04366af894f491fcd
Author: J Mohan Rao Arisankala <mohan at computer.org>
Date:   Sat Feb 27 08:50:07 2016 +0530

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/s_server.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index c28aa51..cd7a1e1 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
@@ -1491,7 +1491,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();