stream.setVersion(QDataStream::Qt_4_2);
quint32 magic = Protocol::magic;
- if (_account.useSsl())
- magic |= Protocol::Encryption;
+ magic |= Protocol::Encryption;
magic |= Protocol::Compression;
stream << magic;
connect(_peer, &RemotePeer::transferProgress, this, &ClientAuthHandler::transferProgress);
// The legacy protocol enables SSL later, after registration
- if (!_account.useSsl() || _legacy)
+ if (_legacy)
startRegistration();
// otherwise, do it now
else
{
emit statusMessage(tr("Synchronizing to core..."));
- // useSsl will be ignored by non-legacy peers
- bool useSsl = false;
- useSsl = _account.useSsl();
-
- _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl));
+ _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate));
}
void ClientAuthHandler::handle(const Protocol::ClientDenied& msg)
_peer->setFeatures(std::move(msg.features));
// The legacy protocol enables SSL at this point
- if (_legacy && _account.useSsl())
+ if (_legacy)
checkAndEnableSsl(msg.sslSupported);
else
onConnectionReady();
void ClientAuthHandler::checkAndEnableSsl(bool coreSupportsSsl)
{
CoreAccountSettings s;
- if (coreSupportsSsl && _account.useSsl()) {
+ if (coreSupportsSsl) {
// Make sure the warning is shown next time we don't have SSL in the core
s.setAccountValue("ShowNoCoreSslWarning", true);
_internal = false;
_port = 4242;
_storePassword = false;
- _useSsl = true;
_proxyType = QNetworkProxy::DefaultProxy;
_proxyPort = 8080;
}
_port = port;
}
-void CoreAccount::setUseSsl(bool useSsl)
-{
- _useSsl = useSsl;
-}
-
void CoreAccount::setProxyType(QNetworkProxy::ProxyType type)
{
_proxyType = type;
v["StorePassword"] = storePassword();
v["HostName"] = hostName();
v["Port"] = port();
- v["UseSSL"] = useSsl();
v["ProxyType"] = proxyType();
v["ProxyUser"] = proxyUser();
v["ProxyPassword"] = proxyPassword();
setStorePassword(v.value("StorePassword").toBool());
setHostName(v.value("HostName").toString());
setPort(v.value("Port").toUInt());
- setUseSsl(v.value("UseSSL").toBool());
setProxyType((QNetworkProxy::ProxyType)v.value("ProxyType").toInt());
setProxyUser(v.value("ProxyUser").toString());
setProxyPassword(v.value("ProxyPassword").toString());
<< qPrintable(QString(", StorePassword:")) << acc.storePassword()
<< qPrintable(QString(", HostName:")) << acc.hostName()
<< qPrintable(QString(", Port:")) << acc.port()
- << qPrintable(QString(", UseSSL:")) << acc.useSsl()
<< qPrintable(QString(", ProxyType:")) << acc.proxyType()
<< qPrintable(QString(", ProxyUser:")) << acc.proxyUser()
<< qPrintable(QString(", ProxyPassword:")) << acc.proxyPassword()
inline bool storePassword() const { return _storePassword; }
inline QString hostName() const { return _hostName; }
inline uint port() const { return _port; }
- inline bool useSsl() const { return _useSsl; }
inline QNetworkProxy::ProxyType proxyType() const { return _proxyType; }
inline QString proxyUser() const { return _proxyUser; }
void setStorePassword(bool);
void setHostName(const QString& hostname);
void setPort(uint port);
- void setUseSsl(bool);
void setProxyType(QNetworkProxy::ProxyType);
void setProxyUser(const QString&);
bool _internal;
QString _user, _password, _hostName;
uint _port;
- bool _storePassword, _useSsl;
+ bool _storePassword{};
QNetworkProxy::ProxyType _proxyType;
QString _proxyUser, _proxyPassword, _proxyHostName;
uint _proxyPort;
// FIXME only in compat mode
m["ProtocolVersion"] = protocolVersion;
- m["UseSsl"] = msg.sslSupported;
+ m["UseSsl"] = true;
#ifndef QT_NO_COMPRESS
m["UseCompression"] = true;
#else