*
* This file is part of Trivial IP Encryption (TrIPE).
*
- * TrIPE is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
*
- * TrIPE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * TrIPE is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
*
* You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE. If not, see <https://www.gnu.org/licenses/>.
*/
/*----- Header files ------------------------------------------------------*/
va_end(ap);
}
-/* --- @a_ok@, @a_info@, @a_fail@ --- *
+/* --- @a_ok@, @a_fail@ --- *
*
* Arguments: @admin *a@ = connection
* @const char *fmt@ = format string
static void a_ok(admin *a) { a_write(a, "OK", 0, A_END); }
-static void a_info(admin *a, const char *fmt, ...)
+static void a_fail(admin *a, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "INFO", 0, fmt, &ap);
+ a_vwrite(a, "FAIL", 0, fmt, &ap);
va_end(ap);
}
-static void a_fail(admin *a, const char *fmt, ...)
+/* --- @a_info@ --- *
+ *
+ * Arguments: @admin *a@ = connection
+ * @const char *fmt@ = format string
+ * @...@ = other arguments
+ *
+ * Returns: ---
+ *
+ * Use: Report information to an admin client.
+ */
+
+void a_info(admin *a, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- a_vwrite(a, "FAIL", 0, fmt, &ap);
+ a_vwrite(a, "INFO", 0, fmt, &ap);
va_end(ap);
}
{
peer *p;
const kdata *kd;
- const group *g;
+ const dhgrp *g;
const algswitch *algs;
if (!ac)
if ((p = a_findpeer(a, av[0])) == 0) return;
kd = p->kx.kpriv;
}
- g = kd->g;
+ g = kd->grp;
algs = &kd->algs;
- a_info(a,
- "kx-group=%s", g->ops->name,
- "kx-group-order-bits=%lu", (unsigned long)mp_bits(g->r),
- "kx-group-elt-bits=%lu", (unsigned long)g->nbits,
- A_END);
+ g->ops->grpinfo(g, a);
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,
- "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);
}