X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0f3faccdf5f2f0cfa40bd9bec495c4930052a51f..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/tests/group

diff --git a/tests/group b/tests/group
index 0c2035a..bc954d0 100644
--- 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.
 
@@ -6,25 +6,25 @@ check {
   "prime { 29, 7, 16 }" "ok";
   "prime { 29, 6, 5 }" "not a subgroup";
   "prime { 21, 2, 2 }" "p is not prime";
-  "prime { 29, 14, 9 }" "group order not prime";        
+  "prime { 29, 14, 9 }" "group order not prime";
 
   "ec { secp224r1 }" "ok";
 
-  "prime { catacomb-g1024 }" "ok";
+  "prime { catacomb-ll-160-1024 }" "ok";
 
-  "ec { 
+  "ec {
      prime:
        0xdb7c2abf62e35e668076bead208b
-     primeproj: 
+     primeproj:
        0xdb7c2abf62e35e668076bead2088, 0x659ef8ba043916eede8911702b22
      0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500
      0xdb7c2abf62e35e7628dfac6561c5 * 1
   }" "ok";
-        
-  "ec { 
+
+  "ec {
      prime:
        0xdb7c2abf62e35e668076bead208b
-     primeproj: 
+     primeproj:
        0xdb7c2abf62e35e668076bead2088, 0x659ef8ba043916eede8911702b22
        0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500
        0xdb7c2abf62e35e7628dfac6561c5 * 2
@@ -32,13 +32,13 @@ check {
 
   # --- This one's oakley-155 ---
 
-  "ec { 
+  "ec {
     binpoly: 0x0800000000000000000000004000000000000001
     binproj: 0, 0x7338F
     0xaa089ae4666a422e714651ad9372213fa65a93,
       0x12d29c630dda76010397809a6816be6d2ffa815
     0xaaaaaaaaaaaaaaaaaab1fcf1e206f421a3ea1b * 12
-  }" "cofactor out of range";
+  }" "degree not prime";
 
 }
 
@@ -50,7 +50,7 @@ checkelt {
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
     0;
 
-  "ec { 
+  "ec {
     binpoly: 0x0800000000000000000000004000000000000001
     binproj: 0, 0x7338F
     0xaa089ae4666a422e714651ad9372213fa65a93,
@@ -65,10 +65,10 @@ checkelt {
 mul {
   "prime { 29, 7, 16 }" 8 7 27;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     32459289443738057373904596685867555624839649360339363831766212033645755638497600605981483758068704145575847399920657057013890131443911836862688141735006
-    1926426135381827210395257472845875618319108487720857260583372274154852182951667715700282388176779441854588992736540698662997833538400244234146123792411051;
+    3947634573386515057215934636174241616115542585724861166389751782289048647501330677434616929656928819642658111077814577650964230037753641582364366136933940;
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
@@ -76,44 +76,44 @@ mul {
     "0xdafebf5828783f2ad35534631588a3f629a70fb16982a888,
        0xdd6bda0d993da0fa46b27bbc141b868f59331afa5c7e93ab"
     "0x76e32a2557599e6edcd283201fb2b9aadfd0d359cbb263da,
-       0x782c37e372ba4520aa62e0fed121d49ef3b543660cfd05fd"; 
+       0x782c37e372ba4520aa62e0fed121d49ef3b543660cfd05fd";
 }
 
 sqr {
   "prime { 29, 7, 16 }" 8 6;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
-    4005285938812802884869056091732317348251189092239718246050415417461526884090403819686629744110427371766834314349639104763417430078158218519967583957470490;
+    1140714521254648115393410274780412972862841854751618635120376750594285456137894804866135103112174518443866054055338095672091997366768745026933347678925721;
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
        0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
     "0xdafebf5828783f2ad35534631588a3f629a70fb16982a888,
-       0xdd6bda0d993da0fa46b27bbc141b868f59331afa5c7e93ab";    
+       0xdd6bda0d993da0fa46b27bbc141b868f59331afa5c7e93ab";
 }
 
 inv {
   "prime { 29, 7, 16 }" 9 13;
-  
-  "prime { catacomb-g512 }"
+
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
-    4681416433015777166273237967077695060929667390767517698895765893629657943327105422863170288075976922965513789634412273770969873436435698540384711636714478;
+    5876676858790113051879264634636727534122591023949326683791506203503263391580079717512212895466773363712551406785344528808275608153699681298608650332072384;
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
        0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
-       0xf8e6d46a003725879cefee1294db32298c06885ee186b7ee";      
+       0xf8e6d46a003725879cefee1294db32298c06885ee186b7ee";
 }
 
 div {
   "prime { 29, 7, 16 }" 9 5 25;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     1926426135381827210395257472845875618319108487720857260583372274154852182951667715700282388176779441854588992736540698662997833538400244234146123792411051
-    4352638698811548340197747445538844858722300429607827242718336069934302793791666196485760252202755936738278388907467170248315316920551773058188278017435713;
+    24069337702503046127918930405335466791703796668849861281722901639361967869381088162761943434867448224639537469251486209856612215080111132649928233405085;
 
   "ec { nist-p192 }"
     "0x76e32a2557599e6edcd283201fb2b9aadfd0d359cbb263da,
@@ -129,15 +129,15 @@ exp {
 
   "prime { 29, 7, 16 }" 3 -12 20;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     147362842169670001895012880214773009850
-    2724858367444359999445242030177839616322236716074995568862882751673310120217819866527178352161554441906932468828696070184371718373894212895486594604883052;
+    5743039465765061017258257285641279669186626264432710496849307123351095219091264933384359874588390730293795471675184250790999035405886273905917889887366080;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     -147362842169670001895012880214773009850
-    1787060841912191849220487080420238350817474901097656088582267726968757275201342587344406900935515285588366012828182975089444331616359162696826008378664956;
+    3548613102603269389984811279864031309564549180885835723408511495891024326106890973751615845620404633717662823827170012116865930893524976817060348977482376;
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
@@ -190,18 +190,18 @@ mexp-2 {
   "prime { 29, 7, 16 }" 3 12 8 2 9;
   "prime { 29, 7, 16 }" 3 -12 8 2 4;
 
-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"
    3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
    -147362842169670001895012880214773009850
    130340428707563070626027539288099297037336608388990593367322442443880297841210613523501678207607756678300142264348927299637006055881968995671289567513600
    91626412351157168611316239052073981423
-   1964042259347008051177500376636104488225042199152152977412099367647894431543835858678217073603604876847502133350210611462670145543437496436961938287223663;
+   1022777063245982511046303002728993765008184164346724419524981660559588777350492245381260023136750231183070065817596986237402046431653662723677455952067221;
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
       0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
     -3131675836296406071791252329528905062261497366991742517193
-    "0xea711858c23d92f9964655910bc90a197a915e90111cf11b, 
+    "0xea711858c23d92f9964655910bc90a197a915e90111cf11b,
       0x664189a1d8b2bb24f2b2ac64b19e2178118842e6ba9f4ad5"
     1110875761630725856340142297645383444629395595869672555585
     "0xaa25bb0bf38b06821e8641c1afb8bc078dbe11c3cf9bc97,
@@ -214,7 +214,7 @@ toint {
 
   "ec { nist-p192 }" inf -1 0;
 
-  "ec { nist-p192 }" 
+  "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
       0x07192b95ffc8da78631011ed6b24cdd573f977a11e794811"
     0 602046282375688656758213480587526111916698976636884684818;
@@ -226,14 +226,14 @@ fromint {
   "prime { 29, 7, 16 }" 39527306161272833161358334459 0 19;
 
   "ec { nist-p192 }" 1 -1 inf;
-  "ec { nist-p192 }" 0 
-    0 "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
+  "ec { nist-p192 }" 0
+    0 "0, 0x7b685605ee600cb363db5ea912f2bb5e3a0a2e0e60360f12";
 }
 
 toec {
   "prime { 29, 7, 16 }" 0 -1 inf;
   "ec { nist-p192 }" inf 0 inf;
-  "ec { secp112r1 }" 
+  "ec { secp112r1 }"
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
     0
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500";
@@ -246,32 +246,32 @@ fromec {
   "ec { secp112r1 }" inf 0 inf;
   "ec { nist-p192 }" "1, 5" -1 inf;
 
-  "ec { secp112r1 }" 
+  "ec { secp112r1 }"
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
     0
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500";
 }
 
 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 }"
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
-    0 "000e09487239995a5ee76b55f9c2f098000ea89ce5af8724c0a23e0e0ff77500";      
+    0 "000e09487239995a5ee76b55f9c2f098000ea89ce5af8724c0a23e0e0ff77500";
   "ec { nist-p192 }"
     "0, 0x8497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed"
     0 "00010000188497a9fa119ff34c9c24a156ed0d44a0c5f5d1f19fc9f0ed";
 }
 
 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,26 +284,26 @@ 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";
 
   "ec { secp112r1 }" inf 0 "00";
   "ec { secp112r1 }"
     "0x09487239995a5ee76b55f9c2f098, 0xa89ce5af8724c0a23e0e0ff77500"
-    0 "0409487239995a5ee76b55f9c2f098a89ce5af8724c0a23e0e0ff77500";      
+    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 { 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;