Commit dad88680 authored by Todd Short's avatar Todd Short Committed by Richard Levitte
Browse files

Fix no-srtp build warnings 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6255)
parent c1c1783d

apps/s_client.c

+4 −0
Original line number Diff line number Diff line
@@ -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();

apps/s_server.c

+4 −0
Original line number Diff line number Diff line
@@ -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();