tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Device::encryptionInfo returned the entire certificate instead of the hash

Browse source 
BUG: 367897
This commit is contained in:
Thmoas Posch 2016-08-29 20:40:36 +02:00 committed by Albert Vaca
parent c9cfac7253
commit a759cdf678
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/device.cpp
View file

@ -401,18 +401,21 @@ bool Device::isPluginEnabled(const QString& pluginName) const
QString Device::encryptionInfo() const QString Device::encryptionInfo() const
{ {
QString result; QString result;
QCryptographicHash::Algorithm digestAlgorithm = QCryptographicHash::Algorithm::Sha1;
QString myCertificate = QString::fromLatin1(KdeConnectConfig::instance()->certificate().toDer()); QString localSha1 = QString::fromLatin1(KdeConnectConfig::instance()->certificate().digest(digestAlgorithm).toHex());
for (int i=2 ; i<myCertificate.size() ; i+=3) { for (int i=2 ; i<localSha1.size() ; i+=3) {
myCertificate.insert(i, ':'); // Improve readability localSha1.insert(i, ':'); // Improve readability
} }
result += i18n("SHA1 fingerprint of your device certificate is: %1\n", myCertificate); result += i18n("SHA1 fingerprint of your device certificate is: %1\n", localSha1);
QString remoteCertificate = KdeConnectConfig::instance()->getDeviceProperty(id(), "certificate"); std::string remotePem = KdeConnectConfig::instance()->getDeviceProperty(id(), "certificate").toStdString();
for (int i=2 ; i<remoteCertificate.size() ; i+=3) { QSslCertificate remoteCertificate = QSslCertificate(QByteArray(remotePem.c_str(), remotePem.size()));
remoteCertificate.insert(i, ':'); // Improve readability QString remoteSha1 = QString::fromLatin1(remoteCertificate.digest(digestAlgorithm).toHex());
for (int i=2 ; i<remoteSha1.size() ; i+=3) {
remoteSha1.insert(i, ':'); // Improve readability
} }
result += i18n("SHA1 fingerprint of remote device certificate is: %1\n", remoteCertificate); result += i18n("SHA1 fingerprint of remote device certificate is: %1\n", remoteSha1);
return result; return result;
} }