tests: Fix tests for 222c8a43... (mp-modsqrt change).

[u/mdw/catacomb] / tests / group

diff --git a/tests/group b/tests/group
index eb9c1fa..2d61c1b 100644 (file)
--- a/tests/group
+++ b/tests/group
@@ -1,4 +1,4 @@
-# $Id: group,v 1.1 2004/04/01 12:50:41 mdw Exp $
+# $Id$
 #
 # Test group abstraction, and a bunch of other things.
 
@@ -38,7 +38,7 @@ check {
     0xaa089ae4666a422e714651ad9372213fa65a93,
       0x12d29c630dda76010397809a6816be6d2ffa815
     0xaaaaaaaaaaaaaaaaaab1fcf1e206f421a3ea1b * 12
-  }" "cofactor out of range";
+  }" "degree not prime";
 
 }
 
@@ -227,7 +227,7 @@ fromint {
 
   "ec { nist-p192 }" 1 -1 inf;
   "ec { nist-p192 }" 0 
-    0 "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
+    0 "0, 0x7b685605ee600cb363db5ea912f2bb5e3a0a2e0e60360f12";
 }
 
 toec {
@@ -253,10 +253,10 @@ fromec {
 }
 
 tobuf {
-  "prime { 29, 7, 16}" 22 -1 "00";
-  "prime { 29, 7, 16}" 22 0 "000116";
-  "prime { 29, 7, 16}" 0 -1 "0000";
-  "prime { 29, 7, 16}" 0 0 "000100";
+  "prime { 29, 7, 16 }" 22 -1 "00";
+  "prime { 29, 7, 16 }" 22 0 "000116";
+  "prime { 29, 7, 16 }" 0 -1 "0000";
+  "prime { 29, 7, 16 }" 0 0 "000100";
 
   "ec { secp112r1 }" inf 0 "0000";
   "ec { secp112r1 }"
@@ -268,10 +268,10 @@ tobuf {
 }
 
 frombuf {
-  "prime { 29, 7, 16}" "00" -1 0;
-  "prime { 29, 7, 16}" "000116" 3 22;
-  "prime { 29, 7, 16}" "00000e" 2 0;
-  "prime { 29, 7, 16}" "000100ff" 3 0;
+  "prime { 29, 7, 16 }" "00" -1 0;
+  "prime { 29, 7, 16 }" "000116" 3 22;
+  "prime { 29, 7, 16 }" "00000e" 2 0;
+  "prime { 29, 7, 16 }" "000100ff" 3 0;
 
   "ec { secp112r1 }" "0000" 2 inf;
   "ec { secp112r1 }"
@@ -282,3 +282,39 @@ frombuf {
     "00010000188497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0eddead"
     29, "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
 }
+
+toraw {
+  "prime { 29, 7, 16 }" 22 -1 "";
+  "prime { 29, 7, 16 }" 22 0 "16";
+  "prime { 29, 7, 16 }" 0 -1 "";
+  "prime { 29, 7, 16 }" 0 0 "00";
+  "prime { 4294967311, 364289, 18767 }" 4285559121 0 "00ff707151";
+  "prime { 4294967311, 364289, 18767 }" 4285559121 -1 "ff707151";
+
+  "ec { secp112r1 }" inf 0 "00";
+  "ec { secp112r1 }"
+    "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
+    0 "0409487239995a5ee76b55f9c2f098a89ce5af8724c0a23e0e0ff77500";      
+  "ec { nist-p192 }"
+    "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed"
+    0 "040000000000000000000000000000000000000000000000008497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
+}
+
+fromraw {
+  "prime { 29, 7, 16 }" "" -1 0;
+  "prime { 29, 7, 16 }" "160bad" 1 22;
+  "prime { 29, 7, 16 }" "00" 1 0;
+  "prime { 4294967311, 364289, 18767 }" "00ff707151e7c0" 5 4285559121;
+  "prime { 4294967311, 364289, 18767 }" "ff707151" -1 0;
+
+  "ec { secp112r1 }" "" -1 inf;
+  "ec { secp112r1 }" "00" 1 inf;
+  "ec { secp112r1 }"
+    "0409487239995a5ee76b55f9c2f098a89ce5af8724c0a23e0e0ff775" -1 inf;
+  "ec { secp112r1 }"
+    "0409487239995a5ee76b55f9c2f098a89ce5af8724c0a23e0e0ff77500"
+    29 "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500";
+  "ec { nist-p192 }"
+    "070000000000000000000000000000000000000000000000008497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed00deadbeef"
+    49 "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
+}