Fix up ectab.in a little more. Fix group test vectors broken by new

[u/mdw/catacomb] / tests / group

diff --git a/tests/group b/tests/group
index 0c2035a..e7ff8e8 100644 (file)
--- a/tests/group
+++ b/tests/group
@@ -1,4 +1,4 @@
-# $Id: group,v 1.2 2004/04/04 19:04:11 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";
 
 }
 
@@ -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 }"
@@ -284,10 +284,10 @@ frombuf {
 }
 
 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 { 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";
 
@@ -301,9 +301,9 @@ toraw {
 }
 
 fromraw {
-  "prime { 29, 7, 16}" "" -1 0;
-  "prime { 29, 7, 16}" "160bad" 1 22;
-  "prime { 29, 7, 16}" "00" 1 0;
+  "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;