From 5ac9463b6365ac278641732c546a77bb61692ffe Mon Sep 17 00:00:00 2001 Message-Id: <5ac9463b6365ac278641732c546a77bb61692ffe.1715293496.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 11 Jan 2007 00:06:46 +0000 Subject: [PATCH] server: Fix some bad warning messages. Organization: Straylight/Edgeware From: Mark Wooding Oops, the arguments to some calls to a_warn are malformed and can cause crashes. Fix them. --- server/keyexch.c | 6 +++--- server/peer.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/keyexch.c b/server/keyexch.c index ae8c9c5d..8577d91e 100644 --- a/server/keyexch.c +++ b/server/keyexch.c @@ -563,7 +563,7 @@ static kxchal *respond(keyexch *kx, unsigned msg, buf *b) /* --- Discard a packet with an invalid cookie --- */ if (hc && memcmp(hc, kx->hc, algs.hashsz) != 0) { - a_warn("KX", "?PEER", "incorrect", "cookie", A_END); + a_warn("KX", "?PEER", kx->p, "incorrect", "cookie", A_END); goto bad; } @@ -950,7 +950,7 @@ static int doswitch(keyexch *kx, buf *b) checkresponse(kx, KX_SWITCH, b)) goto bad; if ((hswrq = buf_get(b, algs.hashsz)) == 0 || BLEFT(b)) { - a_warn("KX", "?PEER", "invalid", "switch-rq", A_END); + a_warn("KX", "?PEER", kx->p, "invalid", "switch-rq", A_END); goto bad; } IF_TRACING(T_KEYEXCH, { @@ -996,7 +996,7 @@ static int doswitchok(keyexch *kx, buf *b) if (decryptrest(kx, kxc, KX_SWITCHOK, b)) goto bad; if ((hswok = buf_get(b, algs.hashsz)) == 0 || BLEFT(b)) { - a_warn("KX", "?PEER", "invalid", "switch-ok", A_END); + a_warn("KX", "?PEER", kx->p, "invalid", "switch-ok", A_END); goto bad; } IF_TRACING(T_KEYEXCH, { diff --git a/server/peer.c b/server/peer.c index fd79a84c..1e5d0766 100644 --- a/server/peer.c +++ b/server/peer.c @@ -247,7 +247,7 @@ found: buf_init(&bb, buf_t, sizeof(buf_t)); if (ksl_decrypt(&p->ks, ch, &b, &bb)) { p->st.n_reject++; - a_warn("PEER", "?PEER", "decrypt-failed", A_END); + a_warn("PEER", "?PEER", p, "decrypt-failed", A_END); return; } if (BOK(&bb)) { -- [mdw]