projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use braced-init list when returning types
[quassel.git]
/
src
/
client
/
clientidentity.cpp
diff --git
a/src/client/clientidentity.cpp
b/src/client/clientidentity.cpp
index
26c0a73
..
dc6ebe5
100644
(file)
--- a/
src/client/clientidentity.cpp
+++ b/
src/client/clientidentity.cpp
@@
-23,23
+23,14
@@
#include "client.h"
#include "signalproxy.h"
#include "client.h"
#include "signalproxy.h"
-INIT_SYNCABLE_OBJECT(CertIdentity)
CertIdentity::CertIdentity(IdentityId id, QObject *parent)
: Identity(id, parent)
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)
{
}
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
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
{
}
#endif
{
}
@@
-111,6
+101,8
@@
void CertIdentity::markClean()
void ClientCertManager::setSslKey(const QByteArray &encoded)
{
QSslKey key(encoded, QSsl::Rsa);
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);
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));
}
_certIdentity->setSslCert(QSslCertificate(encoded));
}
-
#endif // HAVE_SSL
#endif // HAVE_SSL