Mention the negotiated SSH-2 MAC algorithm(s) in the Event Log.

(It should be possible to at least see what MAC is in use without going to a
SSH packet log.)

[originally from svn r4591]

diff --git a/ssh.c b/ssh.c
index d5a1a99bcca7b60f2068f8986e578ee89ed9115c..5b5a6be7973575bb6e4c819929e33af014e9b7c2 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -4502,6 +4502,10 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt)
              ssh->cscipher->text_name);
     logeventf(ssh, "Initialised %.200s server->client encryption",
              ssh->sccipher->text_name);
+    logeventf(ssh, "Initialised %.200s client->server MAC algorithm",
+             ssh->csmac->text_name);
+    logeventf(ssh, "Initialised %.200s server->client MAC algorithm",
+             ssh->scmac->text_name);
     if (ssh->cscomp->text_name)
        logeventf(ssh, "Initialised %s compression",
                  ssh->cscomp->text_name);

diff --git a/ssh.h b/ssh.h
index d7d17ffc9077154e1123f2bf59a954b52341343a..5e41b7ab5cebc3ba9999bf59d38957d865d1f5a3 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -170,6 +170,7 @@ struct ssh_mac {
     int (*verify) (void *, unsigned char *blk, int len, unsigned long seq);
     char *name;
     int len;
+    char *text_name;
 };
 
 struct ssh_kex {

diff --git a/sshmd5.c b/sshmd5.c
index 8913340877bb53976792adc450e7739dd72018c2..325a5aebdd2cecb543f57f1d0a819a13c83994b5 100644 (file)
--- a/sshmd5.c
+++ b/sshmd5.c
@@ -311,5 +311,6 @@ const struct ssh_mac ssh_md5 = {
     hmacmd5_make_context, hmacmd5_free_context, hmacmd5_key_16,
     hmacmd5_generate, hmacmd5_verify,
     "hmac-md5",
-    16
+    16,
+    "HMAC-MD5"
 };

diff --git a/sshsha.c b/sshsha.c
index d7c1f4373b3ead60d05a1d2f04c90acc77ac73f6..d545cf0c2d944d3b841609796a4f5ac27a85cf22 100644 (file)
--- a/sshsha.c
+++ b/sshsha.c
@@ -286,12 +286,14 @@ const struct ssh_mac ssh_sha1 = {
     sha1_make_context, sha1_free_context, sha1_key,
     sha1_generate, sha1_verify,
     "hmac-sha1",
-    20
+    20,
+    "HMAC-SHA1"
 };
 
 const struct ssh_mac ssh_sha1_buggy = {
     sha1_make_context, sha1_free_context, sha1_key_buggy,
     sha1_generate, sha1_verify,
     "hmac-sha1",
-    20
+    20,
+    "bug-compatible HMAC-SHA1"
 };