aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-11-13 14:19:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-11-14 00:06:33 +0000
commit2a802c8029eaed7a2615159a8613b7f1de6cb10a (patch)
tree1373e0284f3dee3454641f9d569c69810b3ce2e2 /apps
parent60a25abdabfa3ba183c2cfc2a66bc5f98bc7faf9 (diff)
downloadopenssl-2a802c8029eaed7a2615159a8613b7f1de6cb10a.tar.gz
add -tls1_2,-tls1_1 options to ciphers command
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/ciphers.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c
index bf3c20499e..5aad1ccb63 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -67,6 +67,8 @@ typedef enum OPTION_choice {
OPT_STDNAME,
OPT_SSL3,
OPT_TLS1,
+ OPT_TLS1_1,
+ OPT_TLS1_2,
OPT_V, OPT_UPPER_V, OPT_S
} OPTION_CHOICE;
@@ -76,6 +78,8 @@ OPTIONS ciphers_options[] = {
{"V", OPT_UPPER_V, '-', "Even more verbose"},
{"s", OPT_S, '-', "Only supported ciphers"},
{"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
{"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
#endif
@@ -134,6 +138,12 @@ int ciphers_main(int argc, char **argv)
case OPT_TLS1:
meth = TLSv1_client_method();
break;
+ case OPT_TLS1_1:
+ meth = TLSv1_1_client_method();
+ break;
+ case OPT_TLS1_2:
+ meth = TLSv1_2_client_method();
+ break;
}
}
argv = opt_rest();