Commit e77bdc73 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent c3fc7eea

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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"},

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -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)"},