From 29f64ea2fa306c8d237bd937703350f9b404662b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 19 Oct 2018 16:16:39 +0200 Subject: [PATCH] SSH: Add missing check in key exchange reply handler We claimed to support the diffie-hellman-group14-sha1 protocol, but forgot to actually handle it. Change-Id: I3193997d7270328700486a15a6281ebf8528ed56 Reviewed-by: Ulf Hermann --- src/libs/ssh/sshincomingpacket.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/ssh/sshincomingpacket.cpp b/src/libs/ssh/sshincomingpacket.cpp index d8c6356a0b3..a105efb48fb 100644 --- a/src/libs/ssh/sshincomingpacket.cpp +++ b/src/libs/ssh/sshincomingpacket.cpp @@ -203,7 +203,8 @@ SshKeyExchangeReply SshIncomingPacket::extractKeyExchangeReply(const QByteArray throw SshPacketParseException(); getHostKeySpecificReplyData(replyData, hostKeyAlgo, replyData.k_s.mid(k_sOffset)); - if (kexAlgo == SshCapabilities::DiffieHellmanGroup1Sha1) { + if (kexAlgo == SshCapabilities::DiffieHellmanGroup1Sha1 + || kexAlgo == SshCapabilities::DiffieHellmanGroup14Sha1) { replyData.f = SshPacketParser::asBigInt(m_data, &topLevelOffset); } else { QSSH_ASSERT_AND_RETURN_VALUE(kexAlgo.startsWith(SshCapabilities::EcdhKexNamePrefix),