X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/9a361a98e47bdade7bf107666441f41b4cb67dd9..c70a7c5cedab62209640b76f03d97c1876e38dc6:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index fcf27d3e..b12a3be6 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -1743,33 +1743,15 @@ static void acmd_algs(admin *a, unsigned ac, char *av[])
 	 "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);
 }