projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use override instead of virtual
[quassel.git]
/
src
/
client
/
clientidentity.cpp
diff --git
a/src/client/clientidentity.cpp
b/src/client/clientidentity.cpp
index
0879e9b
..
16e1c42
100644
(file)
--- a/
src/client/clientidentity.cpp
+++ b/
src/client/clientidentity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-23,11
+23,10
@@
#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)
#ifdef HAVE_SSL
CertIdentity::CertIdentity(IdentityId id, QObject *parent)
: Identity(id, parent)
#ifdef HAVE_SSL
- , _certManager(
0
),
+ , _certManager(
nullptr
),
_isDirty(false)
#endif
{
_isDirty(false)
#endif
{
@@
-37,7
+36,7
@@
CertIdentity::CertIdentity(IdentityId id, QObject *parent)
CertIdentity::CertIdentity(const Identity &other, QObject *parent)
: Identity(other, parent)
#ifdef HAVE_SSL
CertIdentity::CertIdentity(const Identity &other, QObject *parent)
: Identity(other, parent)
#ifdef HAVE_SSL
- , _certManager(
0
),
+ , _certManager(
nullptr
),
_isDirty(false)
#endif
{
_isDirty(false)
#endif
{
@@
-47,7
+46,7
@@
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
),
+ , _certManager(
nullptr
),
_isDirty(other._isDirty),
_sslKey(other._sslKey),
_sslCert(other._sslCert)
_isDirty(other._isDirty),
_sslKey(other._sslKey),
_sslCert(other._sslCert)
@@
-111,6
+110,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
+123,4
@@
void ClientCertManager::setSslCert(const QByteArray &encoded)
_certIdentity->setSslCert(QSslCertificate(encoded));
}
_certIdentity->setSslCert(QSslCertificate(encoded));
}
-
#endif // HAVE_SSL
#endif // HAVE_SSL