/***************************************************************************
- * Copyright (C) 2005-2019 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
: Identity(id, parent)
-#ifdef HAVE_SSL
- , _certManager(*this)
-#endif
+ , _certManager(this)
{
-#ifdef HAVE_SSL
connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
}
CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
: Identity(other, parent)
-#ifdef HAVE_SSL
- , _certManager(*this)
-#endif
+ , _certManager(this)
{
-#ifdef HAVE_SSL
connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
}
CoreIdentity::CoreIdentity(const CoreIdentity& other, QObject* parent)
: Identity(other, parent)
-#ifdef HAVE_SSL
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
- , _certManager(*this)
-#endif
+ , _certManager(this)
{
-#ifdef HAVE_SSL
connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
}
void CoreIdentity::synchronize(SignalProxy* proxy)
{
proxy->synchronize(this);
-#ifdef HAVE_SSL
proxy->synchronize(&_certManager);
-#endif
}
-#ifdef HAVE_SSL
void CoreIdentity::setSslKey(const QByteArray& encoded)
{
QSslKey key(encoded, QSsl::Rsa);
setSslCert(QSslCertificate(encoded));
}
-#endif
-
-#ifdef HAVE_SSL
// ========================================
// CoreCertManager
// ========================================
-CoreCertManager::CoreCertManager(CoreIdentity& identity)
- : CertManager(identity.id())
- , identity(identity)
+CoreCertManager::CoreCertManager(CoreIdentity* identity)
+ : CertManager(identity->id())
+ , _identity(identity)
{
setAllowClientUpdates(true);
}
void CoreCertManager::setSslKey(const QByteArray& encoded)
{
- identity.setSslKey(encoded);
+ _identity->setSslKey(encoded);
CertManager::setSslKey(encoded);
}
void CoreCertManager::setSslCert(const QByteArray& encoded)
{
- identity.setSslCert(encoded);
+ _identity->setSslCert(encoded);
CertManager::setSslCert(encoded);
}
-
-#endif // HAVE_SSL