nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 09:12:24 +00:00
Code Issues Projects Releases Wiki Activity

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

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

[originally from svn r4591]
This commit is contained in:
Jacob Nevins 2004-09-29 23:57:03 +00:00
parent 05696aabfd
commit fb92f118bd
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -4502,6 +4502,10 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt)
ssh->cscipher->text_name); ssh->cscipher->text_name);
logeventf(ssh, "Initialised %.200s server->client encryption", logeventf(ssh, "Initialised %.200s server->client encryption",
ssh->sccipher->text_name); 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) if (ssh->cscomp->text_name)
logeventf(ssh, "Initialised %s compression", logeventf(ssh, "Initialised %s compression",
ssh->cscomp->text_name); ssh->cscomp->text_name);

1
ssh.h
View File

@ -170,6 +170,7 @@ struct ssh_mac {
int (*verify) (void *, unsigned char *blk, int len, unsigned long seq); int (*verify) (void *, unsigned char *blk, int len, unsigned long seq);
char *name; char *name;
int len; int len;
char *text_name;
}; };
struct ssh_kex { struct ssh_kex {

3
sshmd5.c
View File

@ -311,5 +311,6 @@ const struct ssh_mac ssh_md5 = {
hmacmd5_make_context, hmacmd5_free_context, hmacmd5_key_16, hmacmd5_make_context, hmacmd5_free_context, hmacmd5_key_16,
hmacmd5_generate, hmacmd5_verify, hmacmd5_generate, hmacmd5_verify,
"hmac-md5", "hmac-md5",
16 16,
"HMAC-MD5"
}; };

6
sshsha.c
View File

@ -286,12 +286,14 @@ const struct ssh_mac ssh_sha1 = {
sha1_make_context, sha1_free_context, sha1_key, sha1_make_context, sha1_free_context, sha1_key,
sha1_generate, sha1_verify, sha1_generate, sha1_verify,
"hmac-sha1", "hmac-sha1",
20 20,
"HMAC-SHA1"
}; };
const struct ssh_mac ssh_sha1_buggy = { const struct ssh_mac ssh_sha1_buggy = {
sha1_make_context, sha1_free_context, sha1_key_buggy, sha1_make_context, sha1_free_context, sha1_key_buggy,
sha1_generate, sha1_verify, sha1_generate, sha1_verify,
"hmac-sha1", "hmac-sha1",
20 20,
"bug-compatible HMAC-SHA1"
}; };