server/tripe.h: Don't say `struct bulkcrypto' where we don't have to.

[tripe] / server / keymgmt.c

diff --git a/server/keymgmt.c b/server/keymgmt.c
index 17325dc..50abd5d 100644 (file)
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -166,7 +166,7 @@ static const kgops *kgtab[] = {
 /* --- @algs_get@ --- *
  *
  * Arguments:  @algswitch *a@ = where to put the algorithms
- *             @dstr *e@ = where to write errror tokens
+ *             @dstr *e@ = where to write error tokens
  *             @key_file *kf@ = key file
  *             @key *k@ = key to inspect
  *
@@ -374,6 +374,7 @@ int km_samealgsp(const kdata *kdx, const kdata *kdy)
   const algswitch *a = &kdx->algs, *aa = &kdy->algs;
 
   return (group_samep(kdx->g, kdy->g) &&
+         a->bulk == aa->bulk &&
          a->c == aa->c && a->b == aa->b &&
          a->mgf == aa->mgf && a->h == aa->h &&
          a->m == aa->m && a->tagsz == aa->tagsz);
@@ -597,7 +598,7 @@ foundko:
   kd = CREATE(kdata);
   if (kh->load(*ko, *d, kd, &t, &e)) {
     a_warn("KEYMGMT", "%s-keyring", kh->kind,
-          "%s", kh->kr, "key" "%s", t.buf,
+          "%s", kh->kr, "key", "%s", t.buf,
           "*%s", e.buf, A_END);
     goto fail_1;
   }
@@ -882,6 +883,7 @@ void km_unref(kdata *kd)
   G_DESTROY(kd->g, kd->kpub);
   xfree(kd->tag);
   G_DESTROYGROUP(kd->g);
+  DESTROY(kd);
 }
 
 /*----- That's all, folks -------------------------------------------------*/