X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f94b972d1c0389e4e9203cc9919ceaadbe655b61..02dfbd5b7af7816959dbd39c1fe628451204e35f:/dh-param.c

diff --git a/dh-param.c b/dh-param.c
index 5ecb3cb..fcce31f 100644
--- a/dh-param.c
+++ b/dh-param.c
@@ -31,10 +31,24 @@
 
 #include "dh.h"
 #include "ptab.h"
+#include "bintab.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-/* --- @dh_parse@ --- *
+/* ---- @dh_infofromdata@ --- *
+ *
+ * Arguments:	@dh_param *dp@ = parameters to fill in
+ *		@pdata *pd@ = packed data structure
+ *
+ * Returns:	---
+ *
+ * Use:		Fills in a parameters structure from a packed data block.
+ */
+
+void dh_infofromdata(dh_param *dp, pdata *pd)
+  { dp->p = &pd->p; dp->q = &pd->q; dp->g = &pd->g; }
+
+/* --- @dh_parse@, @dhbin_parse@ --- *
  *
  * Arguments:	@qd_parse *qd@ = parser context
  *		@dh_param *dp@ = parameters to fill in
@@ -46,30 +60,50 @@
  *		separated by commas.
  */
 
-static void getinfo(dh_param *dp, pdata *pd)
-  { dp->p = &pd->p; dp->q = &pd->q; dp->g = &pd->g; }
+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)
 {
-  mp *p = MP_NEW, *q = MP_NEW, *g = MP_NEW;
   const pentry *pe;
 
   for (pe = ptab; pe->name; pe++) {
     if (qd_enum(qd, pe->name) >= 0) {
-      getinfo(dp, pe->data);
+      dh_infofromdata(dp, pe->data);
       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) {
+      dh_infofromdata(gb, be->data);
+      goto found;
+    }
+  }
+  if (parse(qd, gb))
+    return (-1);
+found:
+  return (0);
 }
 
 /*----- Test rig ----------------------------------------------------------*/
@@ -81,37 +115,56 @@ fail:
 int main(int argc, char *argv[])
 {
   const pentry *pe;
+  const binentry *be;
   const char *e;
-  int ok = 1;
+  int ok = 1, aok = 1;
   grand *gr;
 
   gr = fibrand_create(0);
-  fputs("checking standard prime fields...\n", stdout);
+  fputs("checking standard prime groups:", stdout);
+  fflush(stdout);
   for (pe = ptab; pe->name; pe++) {
     dh_param dp;
     group *g;
-    getinfo(&dp, pe->data);
-    printf("  %s: ", pe->name);
+    dh_infofromdata(&dp, pe->data);
     g = group_prime(&dp);
     if (mp_bits(dp.q) > 2048 &&
 	(!argv[1] || strcmp(argv[1], "keen") != 0)) {
-      fputs("skipping\n", stdout);
+      printf(" [%s skipped]", pe->name);
+      fflush(stdout);
       continue;
     }
-    fflush(stdout);
     e = G_CHECK(g, gr);
     G_DESTROYGROUP(g);
     dh_paramfree(&dp);
     if (e) {
-      printf("fails: %s\n", e);
-      ok = 0;
+      printf(" [%s failed: %s]", pe->name, e);
+      ok = aok = 0;
     } else
-      fputs("ok\n", stdout);
+      printf(" %s", pe->name);
+    fflush(stdout);
+  }
+  fputs(ok ? " ok\n" : " failed\n", stdout);
+  ok = 1;
+  fputs("checking standard binary groups:", stdout);
+  for (be = bintab; be->name; be++) {
+    gbin_param gb;
+    group *g;
+    dh_infofromdata(&gb, be->data);
+    g = group_binary(&gb);
+    e = G_CHECK(g, gr);
+    G_DESTROYGROUP(g);
+    dh_paramfree(&gb);
+    if (e) {
+      printf(" [%s failed: %s]", be->name, e);
+      ok = aok = 0;
+    } else
+      printf(" %s", be->name);
+    fflush(stdout);
   }
+  fputs(ok ? " ok\n" : " failed\n", stdout);
   gr->ops->destroy(gr);
-  if (ok)
-    fputs("all ok\n", stdout);
-  return (!ok);
+  return (!aok);
 }
 
 #endif