X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/34e4f738bcba58e6d8c4cabbb0b3232a65b42a9d..4a548fc1d5673b2e827e6d0fc3d21b78016f70e2:/dh-param.c

diff --git a/dh-param.c b/dh-param.c
index 66bee09..b02e84b 100644
--- a/dh-param.c
+++ b/dh-param.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dh-param.c,v 1.1 2004/04/01 12:50:09 mdw Exp $
+ * $Id$
  *
  * Reading Diffie-Hellman parameters
  *
@@ -27,26 +27,15 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: dh-param.c,v $
- * Revision 1.1  2004/04/01 12:50:09  mdw
- * Add cyclic group abstraction, with test code.  Separate off exponentation
- * functions for better static linking.  Fix a buttload of bugs on the way.
- * Generally ensure that negative exponents do inversion correctly.  Add
- * table of standard prime-field subgroups.  (Binary field subgroups are
- * currently unimplemented but easy to add if anyone ever finds a good one.)
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "dh.h"
 #include "ptab.h"
+#include "bintab.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-/* --- @dh_parse@ --- *
+/* --- @dh_parse@, @dhbin_parse@ --- *
  *
  * Arguments:	@qd_parse *qd@ = parser context
  *		@dh_param *dp@ = parameters to fill in
@@ -61,9 +50,22 @@
 static void getinfo(dh_param *dp, pdata *pd)
   { dp->p = &pd->p; dp->q = &pd->q; dp->g = &pd->g; }
 
-int dh_parse(qd_parse *qd, dh_param *dp)
+static int parse(qd_parse *qd, gprime_param *dp)
 {
   mp *p = MP_NEW, *q = MP_NEW, *g = MP_NEW;
+
+  if ((p = qd_getmp(qd)) == 0) goto fail;
+  qd_delim(qd, ','); if ((q = qd_getmp(qd)) == 0) goto fail;
+  qd_delim(qd, ','); if ((g = qd_getmp(qd)) == 0) goto fail;
+  dp->p = p; dp->q = q; dp->g = g;
+  return (0);
+fail:
+  mp_drop(p); mp_drop(q); mp_drop(g);
+  return (-1);
+}
+
+int dh_parse(qd_parse *qd, dh_param *dp)
+{
   const pentry *pe;
 
   for (pe = ptab; pe->name; pe++) {
@@ -72,16 +74,26 @@ int dh_parse(qd_parse *qd, dh_param *dp)
       goto found;
     }
   }
-  if ((p = qd_getmp(qd)) == 0) goto fail;
-  qd_delim(qd, ','); if ((q = qd_getmp(qd)) == 0) goto fail;
-  qd_delim(qd, ','); if ((g = qd_getmp(qd)) == 0) goto fail;
-  dp->p = p; dp->q = q; dp->g = g;
+  if (parse(qd, dp))
+    return (-1);
 found:
   return (0);
+}
 
-fail:
-  mp_drop(p); mp_drop(q); mp_drop(g);
-  return (-1);
+int dhbin_parse(qd_parse *qd, gbin_param *gb)
+{
+  const binentry *be;
+
+  for (be = bintab; be->name; be++) {
+    if (qd_enum(qd, be->name) >= 0) {
+      getinfo(gb, be->data);
+      goto found;
+    }
+  }
+  if (parse(qd, gb))
+    return (-1);
+found:
+  return (0);
 }
 
 /*----- Test rig ----------------------------------------------------------*/
@@ -90,32 +102,57 @@ fail:
 
 #include "fibrand.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
   const pentry *pe;
+  const binentry *be;
   const char *e;
   int ok = 1;
   grand *gr;
 
   gr = fibrand_create(0);
-  fputs("checking standard prime fields: ", stdout);
+  fputs("checking standard prime groups...\n", stdout);
   for (pe = ptab; pe->name; pe++) {
     dh_param dp;
     group *g;
     getinfo(&dp, pe->data);
+    printf("  %s: ", pe->name);
     g = group_prime(&dp);
+    if (mp_bits(dp.q) > 2048 &&
+	(!argv[1] || strcmp(argv[1], "keen") != 0)) {
+      fputs("skipping\n", stdout);
+      continue;
+    }
+    fflush(stdout);
     e = G_CHECK(g, gr);
     G_DESTROYGROUP(g);
     dh_paramfree(&dp);
     if (e) {
-      fprintf(stderr, "\n*** group %s fails: %s\n", pe->name, e);
+      printf("fails: %s\n", e);
       ok = 0;
-    }
-    putchar('.');
+    } else
+      fputs("ok\n", stdout);
+  }
+  fputs("checking standard binary groups...\n", stdout);
+  for (be = bintab; be->name; be++) {
+    gbin_param gb;
+    group *g;
+    getinfo(&gb, be->data);
+    printf("  %s: ", be->name);
+    g = group_binary(&gb);
     fflush(stdout);
+    e = G_CHECK(g, gr);
+    G_DESTROYGROUP(g);
+    dh_paramfree(&gb);
+    if (e) {
+      printf("fails: %s\n", e);
+      ok = 0;
+    } else
+      fputs("ok\n", stdout);
   }
   gr->ops->destroy(gr);
-  fputs(ok ? " ok\n" : " failed\n", stdout);
+  if (ok)
+    fputs("all ok\n", stdout);
   return (!ok);
 }