server/: Replace the Diffie--Hellman group abstraction.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 06922dbb18f0509d4525814a4e3b67e1ef3bba09..eb965c1c9b2bf1c63e46d9a7aa0a39666cb37a72 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -374,7 +374,7 @@ static void a_write(admin *a, const char *status, const char *tag,
   va_end(ap);
 }
 
-/* --- @a_ok@, @a_info@, @a_fail@ --- *
+/* --- @a_ok@, @a_fail@ --- *
  *
  * Arguments:  @admin *a@ = connection
  *             @const char *fmt@ = format string
@@ -387,21 +387,32 @@ static void a_write(admin *a, const char *status, const char *tag,
 
 static void a_ok(admin *a) { a_write(a, "OK", 0, A_END); }
 
-static void a_info(admin *a, const char *fmt, ...)
+static void a_fail(admin *a, const char *fmt, ...)
 {
   va_list ap;
 
   va_start(ap, fmt);
-  a_vwrite(a, "INFO", 0, fmt, &ap);
+  a_vwrite(a, "FAIL", 0, fmt, &ap);
   va_end(ap);
 }
 
-static void a_fail(admin *a, const char *fmt, ...)
+/* --- @a_info@ --- *
+ *
+ * Arguments:  @admin *a@ = connection
+ *             @const char *fmt@ = format string
+ *             @...@ = other arguments
+ *
+ * Returns:    ---
+ *
+ * Use:                Report information to an admin client.
+ */
+
+void a_info(admin *a, const char *fmt, ...)
 {
   va_list ap;
 
   va_start(ap, fmt);
-  a_vwrite(a, "FAIL", 0, fmt, &ap);
+  a_vwrite(a, "INFO", 0, fmt, &ap);
   va_end(ap);
 }
 
@@ -1709,7 +1720,7 @@ static void acmd_algs(admin *a, unsigned ac, char *av[])
 {
   peer *p;
   const kdata *kd;
-  const group *g;
+  const dhgrp *g;
   const algswitch *algs;
 
   if (!ac)
@@ -1718,47 +1729,25 @@ static void acmd_algs(admin *a, unsigned ac, char *av[])
     if ((p = a_findpeer(a, av[0])) == 0) return;
     kd = p->kx.kpriv;
   }
-  g = kd->g;
+  g = kd->grp;
   algs = &kd->algs;
 
-  a_info(a,
-        "kx-group=%s", g->ops->name,
-        "kx-group-order-bits=%lu", (unsigned long)mp_bits(g->r),
-        "kx-group-elt-bits=%lu", (unsigned long)g->nbits,
-        A_END);
+  g->ops->grpinfo(g, a);
   a_info(a,
         "hash=%s", algs->h->name,
         "mgf=%s", algs->mgf->name,
         "hash-sz=%lu", (unsigned long)algs->h->hashsz,
         A_END);
   a_info(a,
-        "bulk-transform=%s", algs->bulk->name,
-        "bulk-overhead=%lu", (unsigned long)algs->bulk->overhead(algs),
+        "bulk-transform=%s", algs->bulk->ops->name,
+        "bulk-overhead=%lu",
+        (unsigned long)algs->bulk->ops->overhead(algs->bulk),
         A_END);
-  if (algs->c) {
-    a_info(a,
-          "cipher=%s", algs->c->name,
-          "cipher-keysz=%lu", (unsigned long)algs->cksz,
-          "cipher-blksz=%lu", (unsigned long)algs->c->blksz,
-          A_END);
-  }
+  algs->bulk->ops->alginfo(algs->bulk, a);
   a_info(a,
-        "cipher-data-limit=%lu", (unsigned long)algs->expsz,
+        "cipher-data-limit=%lu",
+        (unsigned long)algs->bulk->ops->expsz(algs->bulk),
         A_END);
-  if (algs->m) {
-    a_info(a,
-          "mac=%s", algs->m->name,
-          "mac-keysz=%lu", (unsigned long)algs->mksz,
-          "mac-tagsz=%lu", (unsigned long)algs->tagsz,
-          A_END);
-  }
-  if (algs->b) {
-    a_info(a,
-          "blkc=%.*s", strlen(algs->b->name) - 4, algs->b->name,
-          "blkc-keysz=%lu", (unsigned long)algs->bksz,
-          "blkc-blksz=%lu", (unsigned long)algs->b->blksz,
-          A_END);
-  }
   a_ok(a);
 }