提交 e77bdc73 编写于 作者: M Matt Caswell

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: NRich Salz <rsalz@openssl.org>
上级 c3fc7eea
...@@ -519,7 +519,7 @@ OPTIONS s_client_options[] = { ...@@ -519,7 +519,7 @@ OPTIONS s_client_options[] = {
"Load the file(s) into the random number generator"}, "Load the file(s) into the random number generator"},
{"sess_out", OPT_SESS_OUT, '>', "File to write SSL session to"}, {"sess_out", OPT_SESS_OUT, '>', "File to write SSL session to"},
{"sess_in", OPT_SESS_IN, '<', "File to read SSL session from"}, {"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"}, "Offer SRTP key management with a colon-separated profile list"},
{"keymatexport", OPT_KEYMATEXPORT, 's', {"keymatexport", OPT_KEYMATEXPORT, 's',
"Export keying material using label"}, "Export keying material using label"},
......
...@@ -949,7 +949,7 @@ OPTIONS s_server_options[] = { ...@@ -949,7 +949,7 @@ OPTIONS s_server_options[] = {
"Set the advertised protocols for the NPN extension (comma-separated list)"}, "Set the advertised protocols for the NPN extension (comma-separated list)"},
#endif #endif
#ifndef OPENSSL_NO_SRTP #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"}, "Offer SRTP key management with a colon-separated profile list"},
{"alpn", OPT_ALPN, 's', {"alpn", OPT_ALPN, 's',
"Set the advertised protocols for the ALPN extension (comma-separated list)"}, "Set the advertised protocols for the ALPN extension (comma-separated list)"},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册