Added more documentation, anomalous curves, support command.

 - Added CURVES.md, FORMAT.md and TESTS.md that talk a bit about what
   ECTester actually does/support.
 - Added anomalous curves (where |F_p| = #|E(F_p)|), meaning these curves
   have a trace of one and ECDLP over them reduces to easy DLP over
   multiplicative F*_p. These concrete curves are from Atsuko Miyaji's
   paper: Elliptic curves over F_p Suitable for Cryptosystems.
 - Added Support command that queries the results of KeyAgreement and
   Signature allocations.
 - Renamed smallpub curves to nonprime curves.
 - Fixed nonprime curves test suite.

23 files changed, 98 insertions, 110 deletions

diff --git a/src/cz/crcs/ectester/data/anomalous/curves.xml b/src/cz/crcs/ectester/data/anomalous/curves.xml
index c478657..b0b9b02 100644
--- a/src/cz/crcs/ectester/data/anomalous/curves.xml
+++ b/src/cz/crcs/ectester/data/anomalous/curves.xml
@@ -1,48 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../schema.xsd">
-    <!--
-    <curve>
-        <id>anomalousp128</id>
-        <bits>128</bits>
-        <field>prime</field>
-        <file>anomalousp128.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp160</id>
-        <bits>160</bits>
-        <field>prime</field>
-        <file>anomalousp160.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp192</id>
-        <bits>192</bits>
-        <field>prime</field>
-        <file>anomalousp192.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp224</id>
-        <bits>224</bits>
-        <field>prime</field>
-        <file>anomalousp224.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp256</id>
-        <bits>256</bits>
-        <field>prime</field>
-        <file>anomalousp256.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp384</id>
-        <bits>384</bits>
-        <field>prime</field>
-        <file>anomalousp384.csv</file>
-    </curve>
-    <curve>
-        <id>anomalousp521</id>
-        <bits>521</bits>
-        <field>prime</field>
-        <file>anomalousp521.csv</file>
-    </curve>
-    -->
-</curves>
\ No newline at end of file
+	<curve>
+		<id>miyaji128a1</id>
+		<bits>128</bits>
+		<field>prime</field>
+		<file>miyaji128a1.csv</file>
+		<desc>First curve in the "Proposed scheme A" section of Atsuko Miyaji's paper.</desc>
+	</curve>
+	<curve>
+		<id>miyaji128a2</id>
+		<bits>128</bits>
+		<field>prime</field>
+		<file>miyaji128a2.csv</file>
+		<desc>Second curve in the "Proposed scheme A" section of Atsuko Miyaji's paper.</desc>
+	</curve>
+	<curve>
+		<id>miyaji128b1</id>
+		<bits>128</bits>
+		<field>prime</field>
+		<file>miyaji128b1.csv</file>
+		<desc>First curve in the "Proposed scheme B" section of Atsuko Miyaji's paper.</desc>
+	</curve>
+	<curve>
+		<id>miyaji128b2</id>
+		<bits>128</bits>
+		<field>prime</field>
+		<file>miyaji128b2.csv</file>
+		<desc>Second curve in the "Proposed scheme B" section of Atsuko Miyaji's paper.</desc>
+	</curve>
+</curves>
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128a1.csv b/src/cz/crcs/ectester/data/anomalous/miyaji128a1.csv
new file mode 100644
index 0000000..b1a84a0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anomalous/miyaji128a1.csv
@@ -0,0 +1 @@
+80000000000001a86a91e9356e5fee11,1210cb7f8a3466b805b546960dd43f69,644a5a3e53a634ee06fa903172806914,55b40a8932013efa328cbe8abaf2f4ec,44375dc6a29cac1982fbf98c86da2707,80000000000001a86a91e9356e5fee11,1
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128a2.csv b/src/cz/crcs/ectester/data/anomalous/miyaji128a2.csv
new file mode 100644
index 0000000..70098c0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anomalous/miyaji128a2.csv
@@ -0,0 +1 @@
+fffffffffffffe1c2758f379fd46b0d9,5e2336fa13c5c6ce7add23893c0dfec7,7bf26de6e350dc183c58c09ad8237e00,1d8b7c787fdc92d299ec14e7916e5f7d,67621e61f115a2544364c1cd52e3cfa7,fffffffffffffe1c2758f379fd46b0d9,1
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128b1.csv b/src/cz/crcs/ectester/data/anomalous/miyaji128b1.csv
new file mode 100644
index 0000000..5c1f8b8
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anomalous/miyaji128b1.csv
@@ -0,0 +1 @@
+800000000000037554ac874c19cdaedf,00000000000000000000000000000000,000000000000000000000000000000c0,635217788a2ff48664a09cb3cdf72b2e,5e69c2309032ef3cb1e41b1a245822be,800000000000037554ac874c19cdaedf,1
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128b2.csv b/src/cz/crcs/ectester/data/anomalous/miyaji128b2.csv
new file mode 100644
index 0000000..fdb77a0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anomalous/miyaji128b2.csv
@@ -0,0 +1 @@
+fffffffffffffe2a71fec762d2427ce7,00000000000000000000000000000000,000000000000000000000000000000c0,428e6765064e4a745b2aaae87ef7f0f7,3daee1541c98c3d51eec13a1f6177531,fffffffffffffe2a71fec762d2427ce7,1
diff --git a/src/cz/crcs/ectester/data/categories.xml b/src/cz/crcs/ectester/data/categories.xml
index d0c9f39..100d962 100644
--- a/src/cz/crcs/ectester/data/categories.xml
+++ b/src/cz/crcs/ectester/data/categories.xml
@@ -22,9 +22,9 @@
         <desc>SEC 2: Recommended Elliptic Curve Domain Parameters version 2.0  January 27, 2010</desc>
     </category>
     <category>
-        <name>smallpub</name>
-        <directory>smallpub</directory>
-        <desc>Non-prime order curves, with points of very small order pregenerated. Useful for testing in ECDH.</desc>
+        <name>nonprime</name>
+        <directory>nonprime</directory>
+        <desc>Non-prime order curves, with points of very small order pregenerated.</desc>
     </category>
     <category>
         <name>wrong</name>
diff --git a/src/cz/crcs/ectester/data/smallpub/curves.xml b/src/cz/crcs/ectester/data/nonprime/curves.xml
index 50c1d0c..e0eb78a 100644
--- a/src/cz/crcs/ectester/data/smallpub/curves.xml
+++ b/src/cz/crcs/ectester/data/nonprime/curves.xml
@@ -2,45 +2,45 @@
 <curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../schema.xsd">
     <curve>
-        <id>ecsp128</id>
+        <id>nonprime128</id>
         <bits>128</bits>
         <field>prime</field>
-        <file>ecsp128.csv</file>
+        <file>nonprime128.csv</file>
     </curve>
     <curve>
-        <id>ecsp160</id>
+        <id>nonprime160</id>
         <bits>160</bits>
         <field>prime</field>
-        <file>ecsp160.csv</file>
+        <file>nonprime160.csv</file>
     </curve>
     <curve>
-        <id>ecsp192</id>
+        <id>nonprime192</id>
         <bits>192</bits>
         <field>prime</field>
-        <file>ecsp192.csv</file>
+        <file>nonprime192.csv</file>
     </curve>
     <curve>
-        <id>ecsp224</id>
+        <id>nonprime224</id>
         <bits>224</bits>
         <field>prime</field>
-        <file>ecsp224.csv</file>
+        <file>nonprime224.csv</file>
     </curve>
     <curve>
-        <id>ecsp256</id>
+        <id>nonprime256</id>
         <bits>256</bits>
         <field>prime</field>
-        <file>ecsp256.csv</file>
+        <file>nonprime256.csv</file>
     </curve>
     <curve>
-        <id>ecsp384</id>
+        <id>nonprime384</id>
         <bits>384</bits>
         <field>prime</field>
-        <file>ecsp384.csv</file>
+        <file>nonprime384.csv</file>
     </curve>
     <curve>
-        <id>ecsp521</id>
+        <id>nonprime521</id>
         <bits>521</bits>
         <field>prime</field>
-        <file>ecsp521.csv</file>
+        <file>nonprime521.csv</file>
     </curve>
 </curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/nonprime/keys.xml b/src/cz/crcs/ectester/data/nonprime/keys.xml
new file mode 100644
index 0000000..c10ae65
--- /dev/null
+++ b/src/cz/crcs/ectester/data/nonprime/keys.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<keys xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="../schema.xsd"
+      category="nonprime"
+      desc="Points on the non-prime curves, very small point orders(3-5).">
+    <pubkey>
+        <id>nonprime128-pub</id>
+        <file>nonprime128_pub.csv</file>
+        <curve>nonprime/nonprime128</curve>
+        <desc>order = 5</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime160-pub</id>
+        <file>nonprime160_pub.csv</file>
+        <curve>nonprime/nonprime160</curve>
+        <desc>order = 3</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime192-pub</id>
+        <file>nonprime192_pub.csv</file>
+        <curve>nonprime/nonprime192</curve>
+        <desc>order = 3</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime224-pub</id>
+        <file>nonprime224_pub.csv</file>
+        <curve>nonprime/nonprime224</curve>
+        <desc>order = 5</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime256-pub</id>
+        <file>nonprime256_pub.csv</file>
+        <curve>nonprime/nonprime256</curve>
+        <desc>order = 3</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime384-pub</id>
+        <file>nonprime384_pub.csv</file>
+        <curve>nonprime/nonprime384</curve>
+        <desc>order = 3</desc>
+    </pubkey>
+    <pubkey>
+        <id>nonprime521-pub</id>
+        <file>nonprime521_pub.csv</file>
+        <curve>nonprime/nonprime521</curve>
+        <desc>order = 5</desc>
+    </pubkey>
+</keys>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp128.csv b/src/cz/crcs/ectester/data/nonprime/nonprime128.csv
index f541010..f541010 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp128.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime128.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp128_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime128_pub.csv
index 78a8cb4..78a8cb4 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp128_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime128_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp160.csv b/src/cz/crcs/ectester/data/nonprime/nonprime160.csv
index e556020..e556020 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp160.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime160.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp160_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime160_pub.csv
index 7b92733..7b92733 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp160_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime160_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp192.csv b/src/cz/crcs/ectester/data/nonprime/nonprime192.csv
index bc55089..bc55089 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp192.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime192.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp192_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime192_pub.csv
index 5432c1d..5432c1d 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp192_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime192_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp224.csv b/src/cz/crcs/ectester/data/nonprime/nonprime224.csv
index 09b9c01..09b9c01 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp224.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime224.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp224_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime224_pub.csv
index 319ca3a..319ca3a 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp224_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime224_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp256.csv b/src/cz/crcs/ectester/data/nonprime/nonprime256.csv
index d5bf3c0..d5bf3c0 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp256.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime256.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp256_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime256_pub.csv
index d27ffdc..d27ffdc 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp256_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime256_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp384.csv b/src/cz/crcs/ectester/data/nonprime/nonprime384.csv
index c58d74b..c58d74b 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp384.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime384.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp384_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime384_pub.csv
index 80f2cd6..80f2cd6 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp384_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime384_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp521.csv b/src/cz/crcs/ectester/data/nonprime/nonprime521.csv
index f6835f1..f6835f1 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp521.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime521.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/ecsp521_pub.csv b/src/cz/crcs/ectester/data/nonprime/nonprime521_pub.csv
index 5cceee6..5cceee6 100644
--- a/src/cz/crcs/ectester/data/smallpub/ecsp521_pub.csv
+++ b/src/cz/crcs/ectester/data/nonprime/nonprime521_pub.csv
diff --git a/src/cz/crcs/ectester/data/smallpub/keys.xml b/src/cz/crcs/ectester/data/smallpub/keys.xml
deleted file mode 100644
index fbdf5e8..0000000
--- a/src/cz/crcs/ectester/data/smallpub/keys.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<keys xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="../schema.xsd"
-      category="smallpub"
-      desc="Points on the Non-prime smallpub curves, very small point orders(3-5).">
-    <pubkey>
-        <id>ecsp128-pub</id>
-        <file>ecsp128_pub.csv</file>
-        <curve>smallpub/ecsp128</curve>
-        <desc>order = 5</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp160-pub</id>
-        <file>ecsp160_pub.csv</file>
-        <curve>smallpub/ecsp160</curve>
-        <desc>order = 3</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp192-pub</id>
-        <file>ecsp192_pub.csv</file>
-        <curve>smallpub/ecsp192</curve>
-        <desc>order = 3</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp224-pub</id>
-        <file>ecsp224_pub.csv</file>
-        <curve>smallpub/ecsp224</curve>
-        <desc>order = 5</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp256-pub</id>
-        <file>ecsp256_pub.csv</file>
-        <curve>smallpub/ecsp256</curve>
-        <desc>order = 3</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp384-pub</id>
-        <file>ecsp384_pub.csv</file>
-        <curve>smallpub/ecsp384</curve>
-        <desc>order = 3</desc>
-    </pubkey>
-    <pubkey>
-        <id>ecsp521-pub</id>
-        <file>ecsp521_pub.csv</file>
-        <curve>smallpub/ecsp521</curve>
-        <desc>order = 5</desc>
-    </pubkey>
-</keys>
\ No newline at end of file