mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix no-srtp build warnings

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6255)
This commit is contained in:
Todd Short 2018-05-14 10:41:06 -04:00 committed by Richard Levitte
parent c1c1783d45
commit dad886806f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_client.c
View File

@ -935,7 +935,9 @@ int s_client_main(int argc, char **argv)
int srp_lateuser = 0; int srp_lateuser = 0;
SRP_ARG srp_arg = { NULL, NULL, 0, 0, 0, 1024 }; SRP_ARG srp_arg = { NULL, NULL, 0, 0, 0, 1024 };
#endif #endif
#ifndef OPENSSL_NO_SRTP
char *srtp_profiles = NULL; char *srtp_profiles = NULL;
#endif
#ifndef OPENSSL_NO_CT #ifndef OPENSSL_NO_CT
char *ctlog_file = NULL; char *ctlog_file = NULL;
int ct_validation = 0; int ct_validation = 0;
@ -1422,7 +1424,9 @@ int s_client_main(int argc, char **argv)
noservername = 1; noservername = 1;
break; break;
case OPT_USE_SRTP: case OPT_USE_SRTP:
#ifndef OPENSSL_NO_SRTP
srtp_profiles = opt_arg(); srtp_profiles = opt_arg();
#endif
break; break;
case OPT_KEYMATEXPORT: case OPT_KEYMATEXPORT:
keymatexportlabel = opt_arg(); keymatexportlabel = opt_arg();

4
apps/s_server.c
View File

@ -1020,7 +1020,9 @@ int s_server_main(int argc, char *argv[])
char *srpuserseed = NULL; char *srpuserseed = NULL;
char *srp_verifier_file = NULL; char *srp_verifier_file = NULL;
#endif #endif
#ifndef OPENSSL_NO_SRTP
char *srtp_profiles = NULL; char *srtp_profiles = NULL;
#endif
int min_version = 0, max_version = 0, prot_opt = 0, no_prot_opt = 0; int min_version = 0, max_version = 0, prot_opt = 0, no_prot_opt = 0;
int s_server_verify = SSL_VERIFY_NONE; int s_server_verify = SSL_VERIFY_NONE;
int s_server_session_id_context = 1; /* anything will do */ 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(); alpn_in = opt_arg();
break; break;
case OPT_SRTP_PROFILES: case OPT_SRTP_PROFILES:
#ifndef OPENSSL_NO_SRTP
srtp_profiles = opt_arg(); srtp_profiles = opt_arg();
#endif
break; break;
case OPT_KEYMATEXPORT: case OPT_KEYMATEXPORT:
keymatexportlabel = opt_arg(); keymatexportlabel = opt_arg();