Rename nonprime curves to -> composite curves.

2 files changed, 9 insertions, 9 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index bb555f9..aff5762 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -216,7 +216,7 @@ public class ECTester {
         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("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("t").longOpt("test").desc("Test ECC support. [test_suite]:\n- default:\n- invalid:\n- wrong:\n- nonprime:\n- test-vectors:").hasArg().argName("test_suite").optionalArg(true).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());
@@ -422,8 +422,8 @@ public class ECTester {
                     case "wrong":
                         suite = new TestSuite.Wrong(dataStore, cfg, systemOutLogger);
                         break;
-                    case "nonprime":
-                        suite = new TestSuite.NonPrime(dataStore, cfg, systemOutLogger);
+                    case "composite":
+                        suite = new TestSuite.Composite(dataStore, cfg, systemOutLogger);
                         break;
                     case "invalid":
                         suite = new TestSuite.Invalid(dataStore, cfg, systemOutLogger);
@@ -739,7 +739,7 @@ public class ECTester {
                 }
 
                 testSuite = cli.getOptionValue("test", "default").toLowerCase();
-                String[] tests = new String[]{"default", "nonprime", "invalid", "test-vectors", "wrong"};
+                String[] tests = new String[]{"default", "composite", "invalid", "test-vectors", "wrong"};
                 List<String> testsList = Arrays.asList(tests);
                 if (!testsList.contains(testSuite)) {
                     System.err.println("Unknown test case. Should be one of: " + Arrays.toString(tests));
diff --git a/src/cz/crcs/ectester/reader/TestSuite.java b/src/cz/crcs/ectester/reader/TestSuite.java
index 7118dd8..24b72a3 100644
--- a/src/cz/crcs/ectester/reader/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/TestSuite.java
@@ -205,21 +205,21 @@ public abstract class TestSuite {
         }
     }
 
-    public static class NonPrime extends TestSuite {
+    public static class Composite extends TestSuite {
 
-        public NonPrime(EC_Store dataStore, ECTester.Config cfg, DirtyLogger systemOut) {
-            super(dataStore, cfg, systemOut, "nonprime");
+        public Composite(EC_Store dataStore, ECTester.Config cfg, DirtyLogger systemOut) {
+            super(dataStore, cfg, systemOut, "composite");
         }
 
         @Override
         public List<Test> run(CardMngr cardManager) throws IOException, CardException {
             /* Do the default tests with the public keys set to provided smallorder keys
-             * over non-prime order curves. Essentially small subgroup attacks.
+             * over composite order curves. Essentially small subgroup attacks.
              * These should fail, the curves aren't safe so that if the computation with
              * a small order public key succeeds the private key modulo the public key order
              * is revealed.
              */
-            Map<String, EC_Key> keys = dataStore.getObjects(EC_Key.class, "nonprime");
+            Map<String, EC_Key> keys = dataStore.getObjects(EC_Key.class, "composite");
             for (EC_Key key : keys.values()) {
                 EC_Curve curve = dataStore.getObject(EC_Curve.class, key.getCurve());
                 if (cfg.namedCurve != null && !(key.getCurve().startsWith(cfg.namedCurve) || key.getCurve().equals(cfg.namedCurve))) {