SSH: Give better name to member variable.

No functional changes.

Change-Id: Ie75fd001c90c2eaaf3c085c92e9ab2279e1fff98
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

5 files changed, 7 insertions, 7 deletions

diff --git a/src/libs/ssh/sshbotanconversions_p.h b/src/libs/ssh/sshbotanconversions_p.h
index 75182881b91..3257eaf04a4 100644
--- a/src/libs/ssh/sshbotanconversions_p.h
+++ b/src/libs/ssh/sshbotanconversions_p.h
@@ -96,7 +96,7 @@ inline const char *botanEmsaAlgoName(const QByteArray &rfcAlgoName)
         return "EMSA1(SHA-1)";
     if (rfcAlgoName == SshCapabilities::PubKeyRsa)
         return "EMSA3(SHA-1)";
-    if (rfcAlgoName == SshCapabilities::PubKeyEcdsa)
+    if (rfcAlgoName == SshCapabilities::PubKeyEcdsa256)
         return "EMSA1_BSI(SHA-256)";
     throw SshClientException(SshInternalError, SSH_TR("Unexpected host key algorithm \"%1\"")
                              .arg(QString::fromLatin1(rfcAlgoName)));
diff --git a/src/libs/ssh/sshcapabilities.cpp b/src/libs/ssh/sshcapabilities.cpp
index 2677768c3ab..60dc3e8659b 100644
--- a/src/libs/ssh/sshcapabilities.cpp
+++ b/src/libs/ssh/sshcapabilities.cpp
@@ -65,9 +65,9 @@ const QList<QByteArray> SshCapabilities::KeyExchangeMethods = QList<QByteArray>(
 
 const QByteArray SshCapabilities::PubKeyDss("ssh-dss");
 const QByteArray SshCapabilities::PubKeyRsa("ssh-rsa");
-const QByteArray SshCapabilities::PubKeyEcdsa("ecdsa-sha2-nistp256");
+const QByteArray SshCapabilities::PubKeyEcdsa256("ecdsa-sha2-nistp256");
 const QList<QByteArray> SshCapabilities::PublicKeyAlgorithms = QList<QByteArray>()
-        << SshCapabilities::PubKeyEcdsa
+        << SshCapabilities::PubKeyEcdsa256
         << SshCapabilities::PubKeyRsa
         << SshCapabilities::PubKeyDss;
 
diff --git a/src/libs/ssh/sshcapabilities_p.h b/src/libs/ssh/sshcapabilities_p.h
index a893ccecbe3..bd7ce8a0634 100644
--- a/src/libs/ssh/sshcapabilities_p.h
+++ b/src/libs/ssh/sshcapabilities_p.h
@@ -50,7 +50,7 @@ public:
 
     static const QByteArray PubKeyDss;
     static const QByteArray PubKeyRsa;
-    static const QByteArray PubKeyEcdsa;
+    static const QByteArray PubKeyEcdsa256;
     static const QList<QByteArray> PublicKeyAlgorithms;
 
     static const QByteArray CryptAlgo3DesCbc;
diff --git a/src/libs/ssh/sshincomingpacket.cpp b/src/libs/ssh/sshincomingpacket.cpp
index 998661719f0..e4d86d13de1 100644
--- a/src/libs/ssh/sshincomingpacket.cpp
+++ b/src/libs/ssh/sshincomingpacket.cpp
@@ -185,7 +185,7 @@ static void getHostKeySpecificReplyData(SshKeyExchangeReply &replyData,
             replyData.hostKeyParameters << SshPacketParser::asBigInt(input, &offset);
         }
     } else {
-        QSSH_ASSERT_AND_RETURN(hostKeyAlgo == SshCapabilities::PubKeyEcdsa);
+        QSSH_ASSERT_AND_RETURN(hostKeyAlgo == SshCapabilities::PubKeyEcdsa256);
         if (SshPacketParser::asString(input, &offset)
                 != hostKeyAlgo.mid(11)) { // Without "ecdsa-sha2-" prefix.
             throw SshPacketParseException();
@@ -221,7 +221,7 @@ SshKeyExchangeReply SshIncomingPacket::extractKeyExchangeReply(const QByteArray
         if (SshPacketParser::asString(fullSignature, &sigOffset) != hostKeyAlgo)
             throw SshPacketParseException();
         replyData.signatureBlob = SshPacketParser::asString(fullSignature, &sigOffset);
-        if (hostKeyAlgo == SshCapabilities::PubKeyEcdsa) {
+        if (hostKeyAlgo == SshCapabilities::PubKeyEcdsa256) {
             // Botan's PK_Verifier wants the signature in this format.
             quint32 blobOffset = 0;
             const Botan::BigInt r = SshPacketParser::asBigInt(replyData.signatureBlob, &blobOffset);
diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp
index 2853ea76d72..25da1805c8b 100644
--- a/src/libs/ssh/sshkeyexchange.cpp
+++ b/src/libs/ssh/sshkeyexchange.cpp
@@ -213,7 +213,7 @@ void SshKeyExchange::sendNewKeysPacket(const SshIncomingPacket &dhReply,
             = new RSA_PublicKey(reply.hostKeyParameters.at(1), reply.hostKeyParameters.at(0));
         sigKey.reset(rsaKey);
     } else {
-        QSSH_ASSERT_AND_RETURN(m_serverHostKeyAlgo == SshCapabilities::PubKeyEcdsa);
+        QSSH_ASSERT_AND_RETURN(m_serverHostKeyAlgo == SshCapabilities::PubKeyEcdsa256);
         const EC_Group domain("secp256r1");
         const PointGFp point = OS2ECP(convertByteArray(reply.q), reply.q.count(),
                                       domain.get_curve());