X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/8ed35e02a3f3d9151794e82d9b7ad68bceb04713..2539ab9c12fde0155822fe9e6393edb265240dae:/server/admin.c diff --git a/server/admin.c b/server/admin.c index 16ab8a35..25581f65 100644 --- a/server/admin.c +++ b/server/admin.c @@ -1731,18 +1731,33 @@ static void acmd_algs(admin *a, unsigned ac, char *av[]) "hash-sz=%lu", (unsigned long)algs->h->hashsz, A_END); a_info(a, - "cipher=%s", algs->c->name, - "cipher-keysz=%lu", (unsigned long)algs->cksz, - "cipher-blksz=%lu", (unsigned long)algs->c->blksz, + "bulk-transform=%s", algs->bulk->name, + "bulk-overhead=%lu", (unsigned long)algs->bulk->overhead(algs), 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); + } a_info(a, "cipher-data-limit=%lu", (unsigned long)algs->expsz, A_END); - 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->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); }