moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup use of static NvHTTP members

Browse Source
This commit is contained in:
Cameron Gutman
2018-06-26 21:49:33 -07:00
parent fca059522c
commit 35c28116f5
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/http/nvpairingmanager.cpp
+13 -13
View File
@@ -169,7 +169,7 @@ NvPairingManager::saltPin(QByteArray salt, QString pin)
NvPairingManager::PairState NvPairingManager::PairState
NvPairingManager::pair(QString serverInfo, QString pin) NvPairingManager::pair(QString serverInfo, QString pin)
{ {
int serverMajorVersion = m_Http.getServerVersionQuad(serverInfo).at(0); int serverMajorVersion = NvHTTP::getServerVersionQuad(serverInfo).at(0);
qDebug() << "Pairing with server generation: " << serverMajorVersion; qDebug() << "Pairing with server generation: " << serverMajorVersion;
QCryptographicHash::Algorithm hashAlgo; QCryptographicHash::Algorithm hashAlgo;
@@ -199,14 +199,14 @@ NvPairingManager::pair(QString serverInfo, QString pin)
"devicename=roth&updateState=1&phrase=getservercert&salt=" + "devicename=roth&updateState=1&phrase=getservercert&salt=" +
salt.toHex() + "&clientcert=" + IdentityManager::get()->getCertificate().toHex(), salt.toHex() + "&clientcert=" + IdentityManager::get()->getCertificate().toHex(),
false); false);
m_Http.verifyResponseStatus(getCert); NvHTTP::verifyResponseStatus(getCert);
if (m_Http.getXmlString(getCert, "paired") != "1") if (NvHTTP::getXmlString(getCert, "paired") != "1")
{ {
qDebug() << "Failed pairing at stage #1"; qDebug() << "Failed pairing at stage #1";
return PairState::FAILED; return PairState::FAILED;
} }
QByteArray serverCert = m_Http.getXmlStringFromHex(getCert, "plaincert"); QByteArray serverCert = NvHTTP::getXmlStringFromHex(getCert, "plaincert");
if (serverCert == nullptr) if (serverCert == nullptr)
{ {
qDebug() << "Server likely already pairing"; qDebug() << "Server likely already pairing";
@@ -221,8 +221,8 @@ NvPairingManager::pair(QString serverInfo, QString pin)
"devicename=roth&updateState=1&clientchallenge=" + "devicename=roth&updateState=1&clientchallenge=" +
encryptedChallenge.toHex(), encryptedChallenge.toHex(),
true); true);
m_Http.verifyResponseStatus(challengeXml); NvHTTP::verifyResponseStatus(challengeXml);
if (m_Http.getXmlString(challengeXml, "paired") != "1") if (NvHTTP::getXmlString(challengeXml, "paired") != "1")
{ {
qDebug() << "Failed pairing at stage #2"; qDebug() << "Failed pairing at stage #2";
m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true); m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
@@ -252,15 +252,15 @@ NvPairingManager::pair(QString serverInfo, QString pin)
"devicename=roth&updateState=1&serverchallengeresp=" + "devicename=roth&updateState=1&serverchallengeresp=" +
encryptedChallengeResponseHash.toHex(), encryptedChallengeResponseHash.toHex(),
true); true);
m_Http.verifyResponseStatus(respXml); NvHTTP::verifyResponseStatus(respXml);
if (m_Http.getXmlString(respXml, "paired") != "1") if (NvHTTP::getXmlString(respXml, "paired") != "1")
{ {
qDebug() << "Failed pairing at stage #3"; qDebug() << "Failed pairing at stage #3";
m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true); m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
return PairState::FAILED; return PairState::FAILED;
} }
QByteArray pairingSecret = m_Http.getXmlStringFromHex(respXml, "pairingsecret"); QByteArray pairingSecret = NvHTTP::getXmlStringFromHex(respXml, "pairingsecret");
QByteArray serverSecret = QByteArray(pairingSecret.data(), 16); QByteArray serverSecret = QByteArray(pairingSecret.data(), 16);
QByteArray serverSignature = QByteArray(&pairingSecret.data()[16], 256); QByteArray serverSignature = QByteArray(&pairingSecret.data()[16], 256);
@@ -293,8 +293,8 @@ NvPairingManager::pair(QString serverInfo, QString pin)
"devicename=roth&updateState=1&clientpairingsecret=" + "devicename=roth&updateState=1&clientpairingsecret=" +
clientPairingSecret.toHex(), clientPairingSecret.toHex(),
true); true);
m_Http.verifyResponseStatus(secretRespXml); NvHTTP::verifyResponseStatus(secretRespXml);
if (m_Http.getXmlString(secretRespXml, "paired") != "1") if (NvHTTP::getXmlString(secretRespXml, "paired") != "1")
{ {
qDebug() << "Failed pairing at stage #4"; qDebug() << "Failed pairing at stage #4";
m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true); m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
@@ -305,8 +305,8 @@ NvPairingManager::pair(QString serverInfo, QString pin)
"pair", "pair",
"devicename=roth&updateState=1&phase=pairchallenge", "devicename=roth&updateState=1&phase=pairchallenge",
true); true);
m_Http.verifyResponseStatus(pairChallengeXml); NvHTTP::verifyResponseStatus(pairChallengeXml);
if (m_Http.getXmlString(pairChallengeXml, "paired") != "1") if (NvHTTP::getXmlString(pairChallengeXml, "paired") != "1")
{ {
qDebug() << "Failed pairing at stage #5"; qDebug() << "Failed pairing at stage #5";
m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true); m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);