generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add -tls1_2,-tls1_1 options to ciphers command

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-11-13 14:19:59 +00:00
parent 60a25abdab
commit 2a802c8029
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/ciphers.c
View File

@ -67,6 +67,8 @@ typedef enum OPTION_choice {
OPT_STDNAME, OPT_STDNAME,
OPT_SSL3, OPT_SSL3,
OPT_TLS1, OPT_TLS1,
OPT_TLS1_1,
OPT_TLS1_2,
OPT_V, OPT_UPPER_V, OPT_S OPT_V, OPT_UPPER_V, OPT_S
} OPTION_CHOICE; } OPTION_CHOICE;
@ -76,6 +78,8 @@ OPTIONS ciphers_options[] = {
{"V", OPT_UPPER_V, '-', "Even more verbose"}, {"V", OPT_UPPER_V, '-', "Even more verbose"},
{"s", OPT_S, '-', "Only supported ciphers"}, {"s", OPT_S, '-', "Only supported ciphers"},
{"tls1", OPT_TLS1, '-', "TLS1 mode"}, {"tls1", OPT_TLS1, '-', "TLS1 mode"},
{"tls1_1", OPT_TLS1_1, '-', "TLS1.1 mode"},
{"tls1_2", OPT_TLS1_2, '-', "TLS1.2 mode"},
#ifndef OPENSSL_NO_SSL_TRACE #ifndef OPENSSL_NO_SSL_TRACE
{"stdname", OPT_STDNAME, '-', "Show standard cipher names"}, {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
#endif #endif
@ -134,6 +138,12 @@ int ciphers_main(int argc, char **argv)
case OPT_TLS1: case OPT_TLS1:
meth = TLSv1_client_method(); meth = TLSv1_client_method();
break; break;
case OPT_TLS1_1:
meth = TLSv1_1_client_method();
break;
case OPT_TLS1_2:
meth = TLSv1_2_client_method();
break;
} }
} }
argv = opt_rest(); argv = opt_rest();