diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cz/crcs/ectester/reader/ECTester.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java index 1b69998..016e095 100644 --- a/src/cz/crcs/ectester/reader/ECTester.java +++ b/src/cz/crcs/ectester/reader/ECTester.java @@ -116,8 +116,8 @@ public class ECTester { case "xml": writer = new XMLOutputWriter(logger.getOutputStream()); break; - case "html": - writer = new HTMLOutputWriter(); + case "yaml": + writer = new YAMLOutputWriter(); break; } } @@ -699,13 +699,18 @@ public class ECTester { fresh = cli.hasOption("fresh"); simulate = cli.hasOption("simulate"); yes = cli.hasOption("yes"); - format = cli.getOptionValue("format"); if (cli.hasOption("list-named")) { listNamed = cli.getOptionValue("list-named"); return true; } + format = cli.getOptionValue("format"); + if (!Arrays.asList("text", "xml", "yaml").contains(format)) { + System.err.println("Wrong output format " + format + "."); + return false; + } + if ((key != null || namedKey != null) && (anyPublicKey || anyPrivateKey)) { System.err.print("Can only specify the whole key with --key/--named-key or pubkey and privkey with --public/--named-public and --private/--named-private."); return false; |