Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

git-svn-id: svn://svn.tartarus.org/sgt/putty@6605 cda61777-01e9-0310-a592-d414129be87e
  • Loading branch information...
commit c6daaa1a4842b06f4eb0f7fef5f969d12b5020ce 1 parent bead8fe
jacob authored
Showing with 5 additions and 3 deletions.
  1. +2 −1  ssh.c
  2. +1 −0  ssh.h
  3. +1 −1  sshsh256.c
  4. +1 −1  sshsha.c
View
3  ssh.c
@@ -5519,7 +5519,8 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
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.
*/
View
1  ssh.h
@@ -190,6 +190,7 @@ struct ssh_hash {
void (*bytes)(void *, void *, int);
void (*final)(void *, unsigned char *); /* also frees context */
int hlen; /* output length in bytes */
+ char *text_name;
};
struct ssh_kex {
View
2  sshsh256.c
@@ -215,7 +215,7 @@ static void sha256_final(void *handle, unsigned char *output)
}
const struct ssh_hash ssh_sha256 = {
- sha256_init, sha256_bytes, sha256_final, 32
+ sha256_init, sha256_bytes, sha256_final, 32, "SHA-256"
};
#ifdef TEST
View
2  sshsha.c
@@ -217,7 +217,7 @@ static void sha1_final(void *handle, unsigned char *output)
}
const struct ssh_hash ssh_sha1 = {
- sha1_init, sha1_bytes, sha1_final, 20
+ sha1_init, sha1_bytes, sha1_final, 20, "SHA-1"
};
/* ----------------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.