X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/6ebbf072683ac7ea09a0aaafa0bb12fc0678d068..a62f8e8a94bf56194539f7140a1215bc74309b36:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 4e87e48c..a62bbe22 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -40,6 +40,7 @@ const trace_opt tr_opts[] = {
   { 'x',	T_KEYEXCH,	"key exchange" },
   { 'm',	T_KEYMGMT,	"key management" },
   { 'l',	T_CHAL,		"challenge management" },
+  { 'v',	T_PRIVSEP,	"privilege separation" },
   { 'p',	T_PACKET,	"packet contents" },
   { 'c',	T_CRYPTO,	"crypto details" },
   { 'A',	T_ALL,		"all of the above" },
@@ -521,6 +522,7 @@ void a_quit(void)
   close(sock.fd);
   unlink(sockname);
   FOREACH_PEER(p, { p_destroy(p); });
+  ps_quit();
   exit(0);
 }
 
@@ -1664,6 +1666,34 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[])
   }
 }
 
+static void acmd_algs(admin *a, unsigned ac, char *av[])
+{
+  a_info(a,
+	 "kx-group=%s", gg->ops->name,
+	 "kx-group-order-bits=%lu", (unsigned long)mp_bits(gg->r),
+	 "kx-group-elt-bits=%lu", (unsigned long)gg->nbits,
+	 A_END);
+  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,
+	 "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);
+  a_ok(a);
+}
+
 static void acmd_list(admin *a, unsigned ac, char *av[])
 {
   FOREACH_PEER(p, {  a_info(a, "%s", p_name(p), A_END); });
@@ -1864,6 +1894,7 @@ static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]);
 static const acmd acmdtab[] = {
   { "add",	"[OPTIONS] PEER ADDR ...", 2,	0xffff,	acmd_add },
   { "addr",	"PEER",			1,	1,	acmd_addr },
+  { "algs",	0,			0,	0,	acmd_algs },
   { "bgcancel",	"TAG",			1,	1,	acmd_bgcancel },
   { "checkchal", "CHAL",		1,	1,	acmd_checkchal },
   { "daemon",	0,			0,	0,	acmd_daemon },