From e77bdc7310fc8fb9e22fd481a991b3576d128b9f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 4 Aug 2015 19:18:02 +0100 Subject: [PATCH] Fix SRTP s_client/s_server options The -use_srtp s_client/s_server option is supposed to take a colon separated string as an argument. In master this was incorrectly set to expect a filename. Reviewed-by: Rich Salz --- apps/s_client.c | 2 +- apps/s_server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index 5971f8aac6..2b69355944 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -519,7 +519,7 @@ OPTIONS s_client_options[] = { "Load the file(s) into the random number generator"}, {"sess_out", OPT_SESS_OUT, '>', "File to write SSL session to"}, {"sess_in", OPT_SESS_IN, '<', "File to read SSL session from"}, - {"use_srtp", OPT_USE_SRTP, '<', + {"use_srtp", OPT_USE_SRTP, 's', "Offer SRTP key management with a colon-separated profile list"}, {"keymatexport", OPT_KEYMATEXPORT, 's', "Export keying material using label"}, diff --git a/apps/s_server.c b/apps/s_server.c index a1fcb6e878..e7c794c2a5 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -949,7 +949,7 @@ OPTIONS s_server_options[] = { "Set the advertised protocols for the NPN extension (comma-separated list)"}, #endif #ifndef OPENSSL_NO_SRTP - {"use_srtp", OPT_SRTP_PROFILES, '<', + {"use_srtp", OPT_SRTP_PROFILES, 's', "Offer SRTP key management with a colon-separated profile list"}, {"alpn", OPT_ALPN, 's', "Set the advertised protocols for the ALPN extension (comma-separated list)"}, -- 2.25.1