13 files changed, 28 insertions, 70 deletions

diff --git a/test/data/f2m_10_a.json b/test/data/f2m_10_a.json
deleted file mode 100644
index e04fbd8..0000000
--- a/test/data/f2m_10_a.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "field": {
-        "m": "0xa",
-        "e1": "0x3",
-        "e2": "0x0",
-        "e3": "0x0"
-    },
-    "a": "0x2ed",
-    "b": "0xb7",
-    "order": "0x3de",
-    "generators": [
-        {
-            "x": "0x16a",
-            "y": "0x197",
-            "order": "0x3de",
-            "cofactor": "0x1"
-        }
-    ],
-    "points": [
-        {
-            "x": "0x0",
-            "y": "0x0",
-            "order": "0x2"
-        },
-        {
-            "x": "0x2fb",
-            "y": "0x285",
-            "order": "0x3"
-        },
-        {
-            "x": "0x9d",
-            "y": "0xd7",
-            "order": "0x5"
-        },
-        {
-            "x": "0x2bc",
-            "y": "0x165",
-            "order": "0xb"
-        }
-    ]
-}
diff --git a/test/data/fp_10_a.json b/test/data/fp_10_a.json
deleted file mode 100644
index 666491a..0000000
--- a/test/data/fp_10_a.json
+++ /dev/null
@@ -1,29 +0,0 @@
-\{
-    "field": \{
-        "p": "0xb"
-    \},
-    "a": "0x1",
-    "b": "0x2",
-    "order": "0x10",
-    "generators": \[
-        \{
-            "x": "0x\d{1,2}",
-            "y": "0x\d{1,2}",
-            "order": "0x8",
-            "cofactor": "0x2"
-        \},
-        \{
-            "x": "0x\d{1,2}",
-            "y": "0x\d{1,2}",
-            "order": "0x8",
-            "cofactor": "0x2"
-        \}
-    \],
-    "points": \[
-        \{
-            "x": "0x\d{1,2}",
-            "y": "0x\d{1,2}",
-            "order": "0x2"
-        \}
-    \]
-\}
\ No newline at end of file
diff --git a/test/data/secp112r1.csv.in b/test/data/secp112r1.csv.in
new file mode 100644
index 0000000..6185cd8
--- /dev/null
+++ b/test/data/secp112r1.csv.in
@@ -0,0 +1 @@
+0xdb7c2abf62e35e668076bead208b,0xdb7c2abf62e35e668076bead2088,0x659ef8ba043916eede8911702b22
\ No newline at end of file
diff --git a/test/data/secp112r1.order.txt b/test/data/secp112r1.order.txt
new file mode 100644
index 0000000..ca1cd62
--- /dev/null
+++ b/test/data/secp112r1.order.txt
@@ -0,0 +1 @@
+0xdb7c2abf62e35e7628dfac6561c5
\ No newline at end of file
diff --git a/test/data/secp128r1.csv.in b/test/data/secp128r1.csv.in
new file mode 100644
index 0000000..d3bf44d
--- /dev/null
+++ b/test/data/secp128r1.csv.in
@@ -0,0 +1 @@
+0xfffffffdffffffffffffffffffffffff,0xfffffffdfffffffffffffffffffffffc,0xe87579c11079f43dd824993c2cee5ed3
\ No newline at end of file
diff --git a/test/data/secp128r1.order.txt b/test/data/secp128r1.order.txt
new file mode 100644
index 0000000..d8253d2
--- /dev/null
+++ b/test/data/secp128r1.order.txt
@@ -0,0 +1 @@
+0xfffffffe0000000075a30d1b9038a115
\ No newline at end of file
diff --git a/test/data/secp160k1.csv.in b/test/data/secp160k1.csv.in
new file mode 100644
index 0000000..ad8506b
--- /dev/null
+++ b/test/data/secp160k1.csv.in
@@ -0,0 +1 @@
+0xfffffffffffffffffffffffffffffffeffffac73,0x0000000000000000000000000000000000000000,0x0000000000000000000000000000000000000007
\ No newline at end of file
diff --git a/test/data/secp160k1.order.txt b/test/data/secp160k1.order.txt
new file mode 100644
index 0000000..d053da5
--- /dev/null
+++ b/test/data/secp160k1.order.txt
@@ -0,0 +1 @@
+0x100000000000000000001b8fa16dfab9aca16b6b3
\ No newline at end of file
diff --git a/test/data/sect163k1.csv.in b/test/data/sect163k1.csv.in
new file mode 100644
index 0000000..d84cdc5
--- /dev/null
+++ b/test/data/sect163k1.csv.in
@@ -0,0 +1 @@
+0x00a3,0x0007,0x0006,0x0003,0x000000000000000000000000000000000000000001,0x000000000000000000000000000000000000000001
\ No newline at end of file
diff --git a/test/data/sect163k1.order.txt b/test/data/sect163k1.order.txt
new file mode 100644
index 0000000..3f43721
--- /dev/null
+++ b/test/data/sect163k1.order.txt
@@ -0,0 +1 @@
+0x0800000000000000000004021145c1981b33f14bde
\ No newline at end of file
diff --git a/test/data/sect163r1.csv.in b/test/data/sect163r1.csv.in
new file mode 100644
index 0000000..9698d07
--- /dev/null
+++ b/test/data/sect163r1.csv.in
@@ -0,0 +1 @@
+0x00a3,0x0007,0x0006,0x0003,0x07b6882caaefa84f9554ff8428bd88e246d2782ae2,0x0713612dcddcb40aab946bda29ca91f73af958afd9
\ No newline at end of file
diff --git a/test/data/sect163r1.order.txt b/test/data/sect163r1.order.txt
new file mode 100644
index 0000000..1a9979a
--- /dev/null
+++ b/test/data/sect163r1.order.txt
@@ -0,0 +1 @@
+0x07fffffffffffffffffffe91556d1385394e204f36
\ No newline at end of file
diff --git a/test/ecgen.sh b/test/ecgen.sh
index 319128d..c8f1d96 100755
--- a/test/ecgen.sh
+++ b/test/ecgen.sh
@@ -142,6 +142,23 @@ function cm() {
     assert_raises "${ecgen} --fp --order=123456789012345678901234567890123456789012345678901234568197 137"
 }
 
+function secg() {
+    function test_order() {
+        name="${1}"
+        field="${2}"
+        bits="${3}"
+        result=$(${ecgen} --${field} --input=data/${name}.csv.in ${bits} 2>/dev/null)
+        result_order=$(cat data/${name}.order.txt)
+        assert_matches "${JSON} -x ^0,\\\"order\\\"" "${result_order}" "${result}"
+    }
+    start_test
+    test_order secp112r1 fp 112
+    test_order secp128r1 fp 128
+    test_order sect163k1 f2m 163
+    test_order sect163r1 f2m 163
+    test_order secp160k1 fp 160
+}
+
 . ${ASSERT} -v
 start_suite
 runs
@@ -155,4 +172,5 @@ twist
 cli
 hex
 cm
+secg
 end_suite ecgen