diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp
index 25da1805c8bafc050ac82c47c08248da81304de2..18ad4971af7760541d37a91f1c0325b77eb0e9a8 100644
--- a/src/libs/ssh/sshkeyexchange.cpp
+++ b/src/libs/ssh/sshkeyexchange.cpp
@@ -252,27 +252,7 @@ void SshKeyExchange::determineHashingAlgorithm(const SshKeyExchangeInit &kexInit
     const QList<QByteArray> &serverCapabilities = serverToClient
             ? kexInit.macAlgorithmsServerToClient.names
             : kexInit.macAlgorithmsClientToServer.names;
-    const QList<QByteArray> commonAlgos = SshCapabilities::commonCapabilities(
-                SshCapabilities::MacAlgorithms, serverCapabilities);
-    const QByteArray hashAlgo = hashAlgoForKexAlgo();
-    foreach (const QByteArray &potentialAlgo, commonAlgos) {
-        if (potentialAlgo == hashAlgo
-                || !m_kexAlgoName.startsWith(SshCapabilities::EcdhKexNamePrefix)) {
-            *algo = potentialAlgo;
-            break;
-        }
-    }
-
-    if (algo->isEmpty()) {
-        throw SshServerException(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-            "Invalid combination of key exchange and hashing algorithms.",
-            QCoreApplication::translate("SshConnection",
-                "Server requested invalid combination of key exchange and hashing algorithms. "
-                "Key exchange algorithm list was: %1.\nHashing algorithm list was %2.")
-                .arg(QString::fromLocal8Bit(kexInit.keyAlgorithms.names.join(", ")))
-                .arg(QString::fromLocal8Bit(serverCapabilities.join(", "))));
-
-    }
+    *algo = SshCapabilities::findBestMatch(SshCapabilities::MacAlgorithms, serverCapabilities);
 }
 
 void SshKeyExchange::checkHostKey(const QByteArray &hostKey)