[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a759cdf

The following commit has been merged in the master branch:
commit a759cdf678c80837a3737dac7a0c0cfb42329720
Author: Thmoas Posch <bugs.kde.org at online.posch.name>
Date:   Mon Aug 29 20:40:36 2016 +0200

    Device::encryptionInfo returned the entire certificate instead of the hash
    
    BUG: 367897
---
 core/device.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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

-- 
kdeconnect packaging