Add utility for computing conversion factors for ONBs. Fix up elliptic curve

[u/mdw/catacomb] / ec-info.c

diff --git a/ec-info.c b/ec-info.c
index 1a95cd2..bf9607c 100644 (file)
--- a/ec-info.c
+++ b/ec-info.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ec-info.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Elliptic curve information management
  *
@@ -34,6 +34,7 @@
 #include "gf.h"
 #include "pgen.h"
 #include "mprand.h"
+#include "mpint.h"
 #include "rabin.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -325,7 +326,7 @@ void ec_freeinfo(ec_info *ei)
 
 static int primeeltp(mp *x, field *f)
 {
-  return (!MP_ISNEG(x) && MP_CMP(x, <, f->m));
+  return (!MP_NEGP(x) && MP_CMP(x, <, f->m));
 }
 
 static const char *primecheck(const ec_info *ei, grand *gr)
@@ -372,11 +373,6 @@ static const char *primecheck(const ec_info *ei, grand *gr)
 
   if (!pgen_primep(ei->r, gr)) return ("generator order not prime");
 
-  /* --- Check %$0 < h \le 4$% --- */
-
-  if (MP_CMP(ei->h, <, MP_ONE) || MP_CMP(ei->h, >, MP_FOUR))
-    return ("cofactor out of range");
-
   /* --- Check %$h = \lfloor (\sqrt{p} + 1)^2/r \rlfoor$% --- *
    *
    * This seems to work with the approximate-sqrt in the library, but might
@@ -421,6 +417,11 @@ static const char *primecheck(const ec_info *ei, grand *gr)
   MP_DROP(x);
   if (i) return ("curve is weak");
 
+  /* --- Check %$0 < h \le 4$% --- */
+
+  if (MP_CMP(ei->h, <, MP_ONE) || MP_CMP(ei->h, >, MP_FOUR))
+    return ("cofactor out of range");
+
   /* --- Done --- */
 
   return (0);
@@ -435,6 +436,13 @@ static const char *bincheck(const ec_info *ei, grand *gr)
   ec p;
   int rc;
 
+  /* --- Check that %$m$% is prime --- */
+
+  x = mp_fromuint(MP_NEW, f->nbits);
+  rc = pfilt_smallfactor(x);
+  mp_drop(x);
+  if (rc != PGEN_DONE) return ("degree not prime");
+
   /* --- Check that %$p$% is irreducible --- */
 
   if (!gf_irreduciblep(f->m)) return ("p not irreducible");
@@ -459,11 +467,6 @@ static const char *bincheck(const ec_info *ei, grand *gr)
 
   if (!pgen_primep(ei->r, gr)) return ("generator order not prime");
 
-  /* --- Check %$0 < h \le 4$% --- */
-
-  if (MP_CMP(ei->h, <, MP_ONE) || MP_CMP(ei->h, >, MP_FOUR))
-    return ("cofactor out of range");
-
   /* --- Check %$h = \lfloor (\sqrt{2^m} + 1)^2/r \rlfoor$% --- *
    *
    * This seems to work with the approximate-sqrt in the library, but might
@@ -505,6 +508,11 @@ static const char *bincheck(const ec_info *ei, grand *gr)
   MP_DROP(x);
   if (i) return ("curve is weak");
 
+  /* --- Check %$0 < h \le 4$% --- */
+
+  if (MP_CMP(ei->h, <, MP_ONE) || MP_CMP(ei->h, >, MP_FOUR))
+    return ("cofactor out of range");
+
   /* --- Done --- */
 
   return (0);
@@ -525,29 +533,51 @@ const char *ec_checkinfo(const ec_info *ei, grand *gr)
 
 #include "fibrand.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
   const ecentry *ee;
   const char *e;
   int ok = 1;
+  int i;
   grand *gr;
 
   gr = fibrand_create(0);
-  fputs("checking standard curves: ", stdout);
-  for (ee = ectab; ee->name; ee++) {
-    ec_info ei;
-    getinfo(&ei, ee->data);
-    e = ec_checkinfo(&ei, gr);
-    ec_freeinfo(&ei);
-    if (e) {
-      fprintf(stderr, "\n*** curve %s fails: %s\n", ee->name, e);
-      ok = 0;
+  if (argc > 1) {
+    for (i = 1; i < argc; i++) {
+      ec_info ei;
+      if ((e = ec_getinfo(&ei, argv[i])) != 0)
+       fprintf(stderr, "bad curve spec `%s': %s", argv[i], e);
+      else {
+       e = ec_checkinfo(&ei, gr);
+       ec_freeinfo(&ei);
+       if (!e)
+         printf("OK %s\n", argv[i]);
+       else {
+         printf("BAD %s: %s\n", argv[i], e);
+         ok = 0;
+       }
+      }
+    }
+  } else {
+    fputs("checking standard curves...\n", stdout);
+    for (ee = ectab; ee->name; ee++) {
+      ec_info ei;
+      printf("  %s: ", ee->name);
+      fflush(stdout);
+      getinfo(&ei, ee->data);
+      e = ec_checkinfo(&ei, gr);
+      ec_freeinfo(&ei);
+      if (e) {
+       printf("fails: %s\n", e);
+       ok = 0;
+      } else
+       fputs("ok\n", stdout);
+      fflush(stdout);
     }
-    putchar('.');
-    fflush(stdout);
+    if (ok)
+      fputs("all ok\n", stdout);
   }
   gr->ops->destroy(gr);
-  fputs(ok ? " ok\n" : " failed\n", stdout);
   return (!ok);
 }