1 files changed, 17 insertions, 21 deletions

diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 016d095..e8998ff 100644
--- a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.standalone;
 
 import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.CLITools;
 import cz.crcs.ectester.common.ec.EC_Curve;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.standalone.consts.KeyPairGeneratorIdent;
@@ -40,15 +41,21 @@ public class ECTesterStandalone {
             CommandLine cli = parseArgs(args);
 
             if (cli.hasOption("help")) {
-                help();
+                CLITools.help("ECTesterStandalone.jar", CLI_HEADER, opts, CLI_FOOTER, true);
                 return;
             } else if (cli.hasOption("version")) {
-                version();
+                CLITools.version(DESCRIPTION, LICENSE);
                 return;
             }
 
             cfg = new Config();
             dataStore = new EC_Store();
+
+            if (cli.hasOption("list-named")) {
+                CLITools.listNamed(dataStore, cli.getOptionValue("list-named"));
+                return;
+            }
+
             for (ECLibrary lib : libs) {
                 if (lib instanceof JavaECLibrary) {
                     JavaECLibrary jlib = (JavaECLibrary) lib;
@@ -72,7 +79,7 @@ public class ECTesterStandalone {
 
             if (cli.hasOption("generate")) {
                 generate();
-            } else if (cli.hasOption("libs")) {
+            } else if (cli.hasOption("list-libs")) {
                 listLibraries();
             }
 
@@ -86,8 +93,14 @@ public class ECTesterStandalone {
         actions.setRequired(true);
         actions.addOption(Option.builder("V").longOpt("version").desc("Print version info.").build());
         actions.addOption(Option.builder("h").longOpt("help").desc("Print help.").build());
+        actions.addOption(Option.builder("e").longOpt("export").desc("Export the defaut curve parameters of the card(if any).").build());
         actions.addOption(Option.builder("g").longOpt("generate").desc("Generate [amount] of EC keys.").hasArg().argName("amount").optionalArg(true).build());
-        actions.addOption(Option.builder("ls").longOpt("libs").desc("List supported libraries.").build());
+        actions.addOption(Option.builder("t").longOpt("test").desc("Test ECC support. [test_suite]:\n- default:\n- invalid:\n- wrong:\n- composite:\n- test-vectors:").hasArg().argName("test_suite").optionalArg(true).build());
+        actions.addOption(Option.builder("dh").longOpt("ecdh").desc("Do ECDH, [count] times.").hasArg().argName("count").optionalArg(true).build());
+        actions.addOption(Option.builder("dhc").longOpt("ecdhc").desc("Do ECDHC, [count] times.").hasArg().argName("count").optionalArg(true).build());
+        actions.addOption(Option.builder("dsa").longOpt("ecdsa").desc("Sign data with ECDSA, [count] times.").hasArg().argName("count").optionalArg(true).build());
+        actions.addOption(Option.builder("ln").longOpt("list-named").desc("Print the list of supported named curves and keys.").hasArg().argName("what").optionalArg(true).build());
+        actions.addOption(Option.builder("ls").longOpt("list-libs").desc("List supported libraries.").build());
         opts.addOptionGroup(actions);
 
         CommandLineParser parser = new DefaultParser();
@@ -95,23 +108,6 @@ public class ECTesterStandalone {
     }
 
     /**
-     * Prints help.
-     */
-    private void help() {
-        HelpFormatter help = new HelpFormatter();
-        help.setOptionComparator(null);
-        help.printHelp("ECTesterStandalone.jar", CLI_HEADER, opts, CLI_FOOTER, true);
-    }
-
-    /**
-     * Prints version info.
-     */
-    private void version() {
-        System.out.println(DESCRIPTION);
-        System.out.println(LICENSE);
-    }
-
-    /**
      *
      */
     private void generate() {