diff --git a/ssh.c b/ssh.c index d5a1a99b..5b5a6be7 100644 --- 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 d7d17ffc..5e41b7ab 100644 --- 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 89133408..325a5aeb 100644 --- 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 d7c1f437..d545cf0c 100644 --- 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" };