X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=8e561688b11104a02375df7bef72b2bcb2e51da8;hp=eb64a12ac5a306efe2bff6d2df44ff1a41eff11c;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index eb64a12a..8e561688 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -23,23 +23,14 @@
 #include "client.h"
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(CertIdentity)
 CertIdentity::CertIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
-#ifdef HAVE_SSL
-    ,  _certManager(0),
-    _isDirty(false)
-#endif
 {
 }
 
 
 CertIdentity::CertIdentity(const Identity &other, QObject *parent)
     : Identity(other, parent)
-#ifdef HAVE_SSL
-    , _certManager(0),
-    _isDirty(false)
-#endif
 {
 }
 
@@ -47,10 +38,9 @@ CertIdentity::CertIdentity(const Identity &other, QObject *parent)
 CertIdentity::CertIdentity(const CertIdentity &other, QObject *parent)
     : Identity(other, parent)
 #ifdef HAVE_SSL
-    , _certManager(0),
-    _isDirty(other._isDirty),
-    _sslKey(other._sslKey),
-    _sslCert(other._sslCert)
+    , _isDirty(other._isDirty)
+    , _sslKey(other._sslKey)
+    , _sslCert(other._sslCert)
 #endif
 {
 }
@@ -65,8 +55,8 @@ void CertIdentity::enableEditSsl(bool enable)
     _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()));
+        connect(_certManager, &SyncableObject::updated, this, &CertIdentity::markClean);
+        connect(_certManager, &SyncableObject::initDone, this, &CertIdentity::markClean);
     }
 }
 
@@ -111,6 +101,8 @@ void CertIdentity::markClean()
 void ClientCertManager::setSslKey(const QByteArray &encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
+    if (key.isNull() && Client::isCoreFeatureEnabled(Quassel::Feature::EcdsaCertfpKeys))
+        key = QSslKey(encoded, QSsl::Ec);
     if (key.isNull())
         key = QSslKey(encoded, QSsl::Dsa);
     _certIdentity->setSslKey(key);
@@ -122,5 +114,4 @@ void ClientCertManager::setSslCert(const QByteArray &encoded)
     _certIdentity->setSslCert(QSslCertificate(encoded));
 }
 
-
 #endif // HAVE_SSL