From 21b5a61032d2cd4fc19bcdd740b88d5ee68e0fb8 Mon Sep 17 00:00:00 2001 From: Martin Prikryl Date: Wed, 15 Jul 2020 08:56:14 +0000 Subject: [PATCH] Bug 1886: Log IANA encryption algorithm names https://winscp.net/tracker/1886 (cherry picked from commit c6401de871eb6e176765fa68ca21eb777a90247c) Source commit: 6848c87c907def0d7bda254a636c0aba93f4d728 --- source/putty/ssh2bpp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/putty/ssh2bpp.c b/source/putty/ssh2bpp.c index 94c64787d..6473478c6 100644 --- a/source/putty/ssh2bpp.c +++ b/source/putty/ssh2bpp.c @@ -129,8 +129,8 @@ void ssh2_bpp_new_outgoing_crypto( (ssh_cipher_alg(s->out.cipher)->flags & SSH_CIPHER_IS_CBC) && !(s->bpp.remote_bugs & BUG_CHOKES_ON_SSH2_IGNORE)); - bpp_logevent("Initialised %s outbound encryption", - ssh_cipher_alg(s->out.cipher)->text_name); + bpp_logevent("Initialised %s [%s] outbound encryption", + ssh_cipher_alg(s->out.cipher)->text_name, ssh_cipher_alg(s->out.cipher)->ssh2_id); } else { s->out.cipher = NULL; s->cbc_ignore_workaround = false; @@ -187,8 +187,8 @@ void ssh2_bpp_new_incoming_crypto( ssh_cipher_setkey(s->in.cipher, ckey); ssh_cipher_setiv(s->in.cipher, iv); - bpp_logevent("Initialised %s inbound encryption", - ssh_cipher_alg(s->in.cipher)->text_name); + bpp_logevent("Initialised %s [%s] inbound encryption", + ssh_cipher_alg(s->in.cipher)->text_name, ssh_cipher_alg(s->in.cipher)->ssh2_id); } else { s->in.cipher = NULL; }