X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/91ac51aa6d078ba287972988fc9cca6593bfbe8f..5e55d10ba1c558cbb3371068970922ea405c728b:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 0e3effb0..25581f65 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -51,7 +51,9 @@ unsigned tr_flags = 0;
 #endif
 
 static const trace_opt w_opts[] = {
+#ifndef NTRACE
   { 't',	AF_TRACE,	"trace messages" },
+#endif
   { 'n',	AF_NOTE,	"asynchronous notifications" },
   { 'w',	AF_WARN,	"warnings" },
   { 'A',	AF_ALLMSGS,	"all of the above" },
@@ -1729,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);
 }
 
@@ -1831,13 +1848,15 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[])
 {
   peer *p;
   const peerspec *ps;
+  const char *ptag;
 
   if ((p = a_findpeer(a, av[0])) != 0) {
     ps = p_spec(p);
     a_info(a, "tunnel=%s", ps->tops->name, A_END);
     a_info(a, "key=%s", p_tag(p),
 	   "current-key=%s", p->kx.kpub->tag, A_END);
-    a_info(a, "private-key=%s", p_privtag(p),
+    if ((ptag = p_privtag(p)) == 0) ptag = "(default)";
+    a_info(a, "private-key=%s", ptag,
 	   "current-private-key=%s", p->kx.kpriv->tag, A_END);
     a_info(a, "keepalive=%lu", ps->t_ka, A_END);
     a_ok(a);