X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=3507a10b7d5b3efd3e6d20ff5b80ec9f70692258;hp=1d93d64b73dbf38e257c8e879af275dde1f24fd6;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 1d93d64b..3507a10b 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "clientidentity.h"
@@ -23,77 +23,108 @@
 #include "client.h"
 #include "signalproxy.h"
 
+INIT_SYNCABLE_OBJECT(CertIdentity)
 CertIdentity::CertIdentity(IdentityId id, QObject *parent)
-  : Identity(id, parent),
-    _certManager(0),
+    : Identity(id, parent)
+#ifdef HAVE_SSL
+    ,  _certManager(0),
     _isDirty(false)
+#endif
 {
 }
 
+
 CertIdentity::CertIdentity(const Identity &other, QObject *parent)
-  : Identity(other, parent),
-    _certManager(0),
+    : Identity(other, parent)
+#ifdef HAVE_SSL
+    , _certManager(0),
     _isDirty(false)
+#endif
 {
 }
 
+
 CertIdentity::CertIdentity(const CertIdentity &other, QObject *parent)
-  : Identity(other, parent),
-    _certManager(0),
+    : Identity(other, parent)
+#ifdef HAVE_SSL
+    , _certManager(0),
     _isDirty(other._isDirty),
     _sslKey(other._sslKey),
     _sslCert(other._sslCert)
+#endif
 {
 }
 
-void CertIdentity::enableEditSsl(bool enable) {
-  if(!enable || _certManager)
-    return;
 
-  _certManager = new ClientCertManager(id(), this);
-  if(isValid()) { // this means we are not a newly created Identity but have a proper Id
-    Client::signalProxy()->synchronize(_certManager);
-    connect(_certManager, SIGNAL(updated(const QVariantMap &)), this, SLOT(markClean()));
-    connect(_certManager, SIGNAL(initDone()), this, SLOT(markClean()));
-  }
+#ifdef HAVE_SSL
+void CertIdentity::enableEditSsl(bool enable)
+{
+    if (!enable || _certManager)
+        return;
+
+    _certManager = new ClientCertManager(id(), this);
+    if (isValid()) { // this means we are not a newly created Identity but have a proper Id
+        Client::signalProxy()->synchronize(_certManager);
+        connect(_certManager, SIGNAL(updated()), this, SLOT(markClean()));
+        connect(_certManager, SIGNAL(initDone()), this, SLOT(markClean()));
+    }
 }
 
-void CertIdentity::setSslKey(const QSslKey &key) {
-  if(key.toPem() == _sslKey.toPem())
-    return;
-  _sslKey = key;
-  _isDirty = true;
+
+void CertIdentity::setSslKey(const QSslKey &key)
+{
+    if (key.toPem() == _sslKey.toPem())
+        return;
+    _sslKey = key;
+    _isDirty = true;
 }
 
-void CertIdentity::setSslCert(const QSslCertificate &cert) {
-  if(cert.toPem() == _sslCert.toPem())
-    return;
-  _sslCert = cert;
-  _isDirty = true;
+
+void CertIdentity::setSslCert(const QSslCertificate &cert)
+{
+    if (cert.toPem() == _sslCert.toPem())
+        return;
+    _sslCert = cert;
+    _isDirty = true;
 }
 
-void CertIdentity::requestUpdateSslSettings() {
-  if(!_certManager)
-    return;
 
-  _certManager->requestUpdate(_certManager->toVariantMap());
+void CertIdentity::requestUpdateSslSettings()
+{
+    if (!_certManager)
+        return;
+
+    _certManager->requestUpdate(_certManager->toVariantMap());
 }
 
-void CertIdentity::markClean() {
-  _isDirty = false;
-  emit sslSettingsUpdated();
+
+void CertIdentity::markClean()
+{
+    _isDirty = false;
+    emit sslSettingsUpdated();
 }
 
+
 // ========================================
 //  ClientCertManager
 // ========================================
-void ClientCertManager::setSslKey(const QByteArray &encoded) {
-  QSslKey key(encoded, QSsl::Rsa);
-  if(key.isNull())
-    key = QSslKey(encoded, QSsl::Dsa);
-  _certIdentity->setSslKey(key);
+void ClientCertManager::setSslKey(const QByteArray &encoded)
+{
+    QSslKey key(encoded, QSsl::Rsa);
+#if QT_VERSION >= 0x050500
+    if (key.isNull() && Client::isCoreFeatureEnabled(Quassel::Feature::EcdsaCertfpKeys))
+        key = QSslKey(encoded, QSsl::Ec);
+#endif
+    if (key.isNull())
+        key = QSslKey(encoded, QSsl::Dsa);
+    _certIdentity->setSslKey(key);
 }
 
-void ClientCertManager::setSslCert(const QByteArray &encoded) {
-  _certIdentity->setSslCert(QSslCertificate(encoded));
+
+void ClientCertManager::setSslCert(const QByteArray &encoded)
+{
+    _certIdentity->setSslCert(QSslCertificate(encoded));
 }
+
+
+#endif // HAVE_SSL