From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 3 Sep 2017 13:12:47 +0000 (+0100)
Subject: server/keymgmt.c: Check algorithms on public keys too.
X-Git-Tag: 1.5.0~98
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/e6a013d3b7c08d9c296809fcb6299c49fcd68ee4?hp=ed621603eb44a44973084d943f64bea3a64b31e6

server/keymgmt.c: Check algorithms on public keys too.

As well as checking stuff, this also calculates some important stuff,
such as preferred key lengths.  Also, it's quite quick, so this isn't
going to cause any performance trouble.
---

diff --git a/server/keymgmt.c b/server/keymgmt.c
index e0861069..51a13d70 100644
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -377,7 +377,7 @@ founddh:
   }
 
   if (algs_get(&kd->algs, &e, kh->kf, k) ||
-      (kd->k && algs_check(&kd->algs, &e, kd->grp))) {
+      algs_check(&kd->algs, &e, kd->grp)) {
     a_warn("KEYMGMT", "%s-keyring", kh->kind,
 	   "%s", kh->kr, "key", "%s", t.buf,
 	   "*%s", e.buf, A_END);