X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/388e0319a0faf48193658c82228133bd1ea24eb6..a571143bb22f1d32cb70e5b62dd07cab529efea1:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index ccd49b73..a339167c 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -1205,6 +1205,7 @@ static void a_doadd(admin_resop *r, int rc)
       a_bgok(&add->r.bg);
   }
 
+  if (add->peer.tag) xfree(add->peer.tag);
   xfree(add->peer.name);
 }
 
@@ -1228,6 +1229,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 
   add = xmalloc(sizeof(*add));
   add->peer.name = 0;
+  add->peer.tag = 0;
   add->peer.t_ka = 0;
   add->peer.tops = tun_default;
   add->peer.kxf = 0;
@@ -1251,6 +1253,11 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
     })
     OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
     OPT("-cork", { add->peer.kxf |= KXF_CORK; })
+    OPTARG("-key", arg, {
+      if (add->peer.tag)
+	xfree(add->peer.tag);
+      add->peer.tag = xstrdup(arg);
+    })
   });
 
   /* --- Make sure someone's not got there already --- */
@@ -1275,6 +1282,7 @@ bad_syntax:
   a_fail(a, "bad-syntax", "add", "[OPTIONS] PEER ADDR ...", A_END);
 fail:
   if (add->peer.name) xfree(add->peer.name);
+  if (add->peer.tag) xfree(add->peer.tag);
   xfree(add);
   return;
 }
@@ -1666,6 +1674,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); });
@@ -1757,6 +1793,7 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[])
   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", ps->tag, A_END);
     a_info(a, "keepalive=%lu", ps->t_ka, A_END);
     a_ok(a);
   }
@@ -1866,6 +1903,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 },