add -tls1_2,-tls1_1 options to ciphers command

Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/apps/ciphers.c b/apps/ciphers.c
index bf3c20499e1f35db9b3340ac72a0e440c888045c..5aad1ccb634c1b3669ea6e81fca816795d56f91c 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -67,6 +67,8 @@ typedef enum OPTION_choice {
     OPT_STDNAME,
     OPT_SSL3,
     OPT_TLS1,
     OPT_STDNAME,
     OPT_SSL3,
     OPT_TLS1,

+    OPT_TLS1_1,
+    OPT_TLS1_2,

     OPT_V, OPT_UPPER_V, OPT_S
 } OPTION_CHOICE;
 
     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"},
     {"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
 #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:
             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();
         }
     }
     argv = opt_rest();