prime groups: Fix tests

Some of the tests still used the old groups, so they needed fixing.
Also the group checker was too zealous, and skipped groups depending on
their subgroup order, not field size, which can now cause all sorts of
stupidity.

diff --git a/dh-param.c b/dh-param.c
index fcce31f..26ee000 100644 (file)
--- a/dh-param.c
+++ b/dh-param.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     group *g;
     dh_infofromdata(&dp, pe->data);
     g = group_prime(&dp);
     group *g;
     dh_infofromdata(&dp, pe->data);
     g = group_prime(&dp);

-    if (mp_bits(dp.q) > 2048 &&
+    if (mp_bits(dp.p) > 2048 &&

        (!argv[1] || strcmp(argv[1], "keen") != 0)) {
       printf(" [%s skipped]", pe->name);
       fflush(stdout);
        (!argv[1] || strcmp(argv[1], "keen") != 0)) {
       printf(" [%s skipped]", pe->name);
       fflush(stdout);

diff --git a/tests/group b/tests/group
index 2d61c1b..2ba7ca6 100644 (file)
--- a/tests/group
+++ b/tests/group
@@ -10,7 +10,7 @@ check {
 
   "ec { secp224r1 }" "ok";
 
 
   "ec { secp224r1 }" "ok";
 

-  "prime { catacomb-g1024 }" "ok";
+  "prime { catacomb-ll-160-1024 }" "ok";

 
   "ec { 
      prime:
 
   "ec { 
      prime:


@@ -65,10 +65,10 @@ checkelt {
 mul {
   "prime { 29, 7, 16 }" 8 7 27;
 
 mul {
   "prime { 29, 7, 16 }" 8 7 27;
 

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     32459289443738057373904596685867555624839649360339363831766212033645755638497600605981483758068704145575847399920657057013890131443911836862688141735006
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     32459289443738057373904596685867555624839649360339363831766212033645755638497600605981483758068704145575847399920657057013890131443911836862688141735006

-    1926426135381827210395257472845875618319108487720857260583372274154852182951667715700282388176779441854588992736540698662997833538400244234146123792411051;
+    3947634573386515057215934636174241616115542585724861166389751782289048647501330677434616929656928819642658111077814577650964230037753641582364366136933940;

 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,


@@ -82,9 +82,9 @@ mul {
 sqr {
   "prime { 29, 7, 16 }" 8 6;
 
 sqr {
   "prime { 29, 7, 16 }" 8 6;
 

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590

-    4005285938812802884869056091732317348251189092239718246050415417461526884090403819686629744110427371766834314349639104763417430078158218519967583957470490;
+    1140714521254648115393410274780412972862841854751618635120376750594285456137894804866135103112174518443866054055338095672091997366768745026933347678925721;

 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,


@@ -96,9 +96,9 @@ sqr {
 inv {
   "prime { 29, 7, 16 }" 9 13;
   
 inv {
   "prime { 29, 7, 16 }" 9 13;
   

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590

-    4681416433015777166273237967077695060929667390767517698895765893629657943327105422863170288075976922965513789634412273770969873436435698540384711636714478;
+    5876676858790113051879264634636727534122591023949326683791506203503263391580079717512212895466773363712551406785344528808275608153699681298608650332072384;

 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,


@@ -110,10 +110,10 @@ inv {
 div {
   "prime { 29, 7, 16 }" 9 5 25;
 
 div {
   "prime { 29, 7, 16 }" 9 5 25;
 

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     1926426135381827210395257472845875618319108487720857260583372274154852182951667715700282388176779441854588992736540698662997833538400244234146123792411051
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     1926426135381827210395257472845875618319108487720857260583372274154852182951667715700282388176779441854588992736540698662997833538400244234146123792411051

-    4352638698811548340197747445538844858722300429607827242718336069934302793791666196485760252202755936738278388907467170248315316920551773058188278017435713;
+    24069337702503046127918930405335466791703796668849861281722901639361967869381088162761943434867448224639537469251486209856612215080111132649928233405085;

 
   "ec { nist-p192 }"
     "0x76e32a2557599e6edcd283201fb2b9aadfd0d359cbb263da,
 
   "ec { nist-p192 }"
     "0x76e32a2557599e6edcd283201fb2b9aadfd0d359cbb263da,


@@ -129,15 +129,15 @@ exp {
 
   "prime { 29, 7, 16 }" 3 -12 20;
 
 
   "prime { 29, 7, 16 }" 3 -12 20;
 

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     147362842169670001895012880214773009850
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     147362842169670001895012880214773009850

-    2724858367444359999445242030177839616322236716074995568862882751673310120217819866527178352161554441906932468828696070184371718373894212895486594604883052;
+    5743039465765061017258257285641279669186626264432710496849307123351095219091264933384359874588390730293795471675184250790999035405886273905917889887366080;

 
 

-  "prime { catacomb-g512 }"
+  "prime { catacomb-ll-128-512 }"

     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     -147362842169670001895012880214773009850
     3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
     -147362842169670001895012880214773009850

-    1787060841912191849220487080420238350817474901097656088582267726968757275201342587344406900935515285588366012828182975089444331616359162696826008378664956;
+    3548613102603269389984811279864031309564549180885835723408511495891024326106890973751615845620404633717662823827170012116865930893524976817060348977482376;

 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,


@@ -190,12 +190,12 @@ mexp-2 {
   "prime { 29, 7, 16 }" 3 12 8 2 9;
   "prime { 29, 7, 16 }" 3 -12 8 2 4;
 
   "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
    3344609493517948819439808013094817124423784439045485500527919676470975342917009634212031124646834193243018749323077268170586751415510015906107400678608590
    -147362842169670001895012880214773009850
    130340428707563070626027539288099297037336608388990593367322442443880297841210613523501678207607756678300142264348927299637006055881968995671289567513600
    91626412351157168611316239052073981423

-   1964042259347008051177500376636104488225042199152152977412099367647894431543835858678217073603604876847502133350210611462670145543437496436961938287223663;
+   1022777063245982511046303002728993765008184164346724419524981660559588777350492245381260023136750231183070065817596986237402046431653662723677455952067221;

 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,
 
   "ec { nist-p192 }"
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012,