From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 24 Nov 2019 01:39:23 +0000 (+0000)
Subject: site: Include key indices in log output
X-Git-Tag: v0.6.0~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=2d1e1de90fc3e7c5d49932d2393b68f1e1b90119

site: Include key indices in log output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/site.c b/site.c
index a73dcac..5d2f519 100644
--- a/site.c
+++ b/site.c
@@ -711,8 +711,8 @@ static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what,
 	return False;
 
     privkey_found:
-	slog(st,LOG_SIGKEYS,"using private key " SIGKEYID_PR_FMT,
-	     SIGKEYID_PR_VAL(prompt->pubkeys_accepted[ki]));
+	slog(st,LOG_SIGKEYS,"using private key #%d " SIGKEYID_PR_FMT,
+	     ki, SIGKEYID_PR_VAL(prompt->pubkeys_accepted[ki]));
 	buf_append_uint8(&st->buffer,ki);
     }
 
@@ -1091,11 +1091,12 @@ static bool_t process_msg3_msg4(struct site *st, struct msg *m)
 		       m->hashstart,m->hashlen,
 		       &m->sig)) {
 	slog(st,LOG_SEC,"msg3/msg4 signature failed check!"
-	     " (key " SIGKEYID_PR_FMT ")",
-	     SIGKEYID_PR_VAL(&st->peerkeys_kex->keys[ki].id));
+	     " (key #%d " SIGKEYID_PR_FMT ")",
+	     ki, SIGKEYID_PR_VAL(&st->peerkeys_kex->keys[ki].id));
 	return False;
     }
-    slog(st,LOG_SIGKEYS,"verified peer signature with key " SIGKEYID_PR_FMT,
+    slog(st,LOG_SIGKEYS,"verified peer signature with key #%d "
+	 SIGKEYID_PR_FMT, ki,
 	 SIGKEYID_PR_VAL(&st->peerkeys_kex->keys[ki].id));
 
     st->remote_adv_mtu=m->remote_mtu;