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

Log the hash used for DH kex (now there's a choice).

Browse Source 
[originally from svn r6605]
This commit is contained in:
Jacob Nevins 2006-03-12 15:39:19 +00:00
parent 8e368671cc
commit 2cf27e43bb
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssh.c
View File

@ -5519,7 +5519,8 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
ssh->kex->groupname); ssh->kex->groupname);
} }
logevent("Doing Diffie-Hellman key exchange"); logeventf(ssh, "Doing Diffie-Hellman key exchange with hash %s",
ssh->kex->hash->text_name);
/* /*
* Now generate and send e for Diffie-Hellman. * Now generate and send e for Diffie-Hellman.
*/ */

1
ssh.h
View File

@ -190,6 +190,7 @@ struct ssh_hash {
void (*bytes)(void *, void *, int); void (*bytes)(void *, void *, int);
void (*final)(void *, unsigned char *); /* also frees context */ void (*final)(void *, unsigned char *); /* also frees context */
int hlen; /* output length in bytes */ int hlen; /* output length in bytes */
char *text_name;
}; };
struct ssh_kex { struct ssh_kex {

2
sshsh256.c
View File

@ -215,7 +215,7 @@ static void sha256_final(void *handle, unsigned char *output)
} }
const struct ssh_hash ssh_sha256 = { const struct ssh_hash ssh_sha256 = {
sha256_init, sha256_bytes, sha256_final, 32 sha256_init, sha256_bytes, sha256_final, 32, "SHA-256"
}; };
#ifdef TEST #ifdef TEST

2
sshsha.c
View File

@ -217,7 +217,7 @@ static void sha1_final(void *handle, unsigned char *output)
} }
const struct ssh_hash ssh_sha1 = { const struct ssh_hash ssh_sha1 = {
sha1_init, sha1_bytes, sha1_final, 20 sha1_init, sha1_bytes, sha1_final, 20, "SHA-1"
}; };
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------