mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-13 17:17:37 -05:00
Identify hash function implementations in the Event Log.
Similarly to the 'AES (unaccelerated)' naming scheme I added in the AES rewrite, the hash functions that have multiple implementations now each come with an annotation saying which one they are. This was more tricky for hashes than for ciphers, because the annotation for a hash has to be a separate string literal from the base text name, so that it can propagate into the name field for each HMAC wrapper without looking silly.
This commit is contained in:
@ -119,7 +119,7 @@ void ssh2kex_coroutine(struct ssh2_transport_state *s, bool *aborted)
|
||||
}
|
||||
|
||||
ppl_logevent("Doing Diffie-Hellman key exchange with hash %s",
|
||||
s->kex_alg->hash->text_name);
|
||||
ssh_hash_alg(s->exhash)->text_name);
|
||||
|
||||
/*
|
||||
* Generate e for Diffie-Hellman.
|
||||
@ -187,7 +187,7 @@ void ssh2kex_coroutine(struct ssh2_transport_state *s, bool *aborted)
|
||||
} else if (s->kex_alg->main_type == KEXTYPE_ECDH) {
|
||||
ppl_logevent("Doing ECDH key exchange with curve %s and hash %s",
|
||||
ssh_ecdhkex_curve_textname(s->kex_alg),
|
||||
s->kex_alg->hash->text_name);
|
||||
ssh_hash_alg(s->exhash)->text_name);
|
||||
s->ppl.bpp->pls->kctx = SSH2_PKTCTX_ECDHKEX;
|
||||
|
||||
s->ecdh_key = ssh_ecdhkex_newkey(s->kex_alg);
|
||||
@ -240,7 +240,7 @@ void ssh2kex_coroutine(struct ssh2_transport_state *s, bool *aborted)
|
||||
} else {
|
||||
assert(s->kex_alg->main_type == KEXTYPE_RSA);
|
||||
ppl_logevent("Doing RSA key exchange with hash %s",
|
||||
s->kex_alg->hash->text_name);
|
||||
ssh_hash_alg(s->exhash)->text_name);
|
||||
s->ppl.bpp->pls->kctx = SSH2_PKTCTX_RSAKEX;
|
||||
|
||||
{
|
||||
|
Reference in New Issue
Block a user