From ba87fc9e786b7518806a256a36877c584b2dc0df Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Mon, 10 Feb 2020 13:08:19 +0100 Subject: [PATCH] [SSL] Properly restore user accepted certificats --- src/gui/accountmanager.cpp | 4 +++- src/libsync/account.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 85f475cac..98357e3d3 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -332,7 +332,9 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) // now the server cert, it is in the general group settings.beginGroup(QLatin1String("General")); - acc->setApprovedCerts(QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray())); + const auto certs = QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray()); + qCInfo(lcAccountManager) << "Restored: " << certs.count() << " unknown certs."; + acc->setApprovedCerts(certs); settings.endGroup(); return acc; diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index b13fd329d..ee6d76305 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -327,6 +327,7 @@ QSslConfiguration Account::getOrCreateSslConfig() void Account::setApprovedCerts(const QList certs) { _approvedCerts = certs; + QSslSocket::addDefaultCaCertificates(certs); } void Account::addApprovedCerts(const QList certs)