AbstractSslErrorHandler: Also give QSslConfiguration

diff --git a/src/cmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp
index c5a98c1f081f814b3cd191e4610c6f4116e3184c..60a68c4d5dfe21b259e53cee27f13c88a55a9415 100644 (file)
--- a/src/cmd/simplesslerrorhandler.cpp
+++ b/src/cmd/simplesslerrorhandler.cpp
@@ -15,9 +15,10 @@
 #include "account.h"
 #include "simplesslerrorhandler.h"
 
-bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, OCC::AccountPtr account)
+bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr account)
 {
     (void) account;
+    (void) conf;
 
     if (!certs) {
         qDebug() << "Certs parameter required but is NULL!";

diff --git a/src/cmd/simplesslerrorhandler.h b/src/cmd/simplesslerrorhandler.h
index 956c637d0fcf3435fc0732cf32a036cea60edfa1..11b99a19f18c10005e8d8bcbc95b537f00283371 100644 (file)
--- a/src/cmd/simplesslerrorhandler.h
+++ b/src/cmd/simplesslerrorhandler.h
@@ -20,7 +20,7 @@ class QSslCertificate;
 
 class SimpleSslErrorHandler : public OCC::AbstractSslErrorHandler {
 public:
-    bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, OCC::AccountPtr) Q_DECL_OVERRIDE;
+    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr) Q_DECL_OVERRIDE;
 };
 
 #endif // SIMPLESSLERRORHANDLER_H

diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index b6c6e2a24d06a1c77c8ab99e28dfa938e9bd25a2..ec8acd95292b46a04ce2132bf9bdd158c7f9d71f 100644 (file)
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -34,8 +34,9 @@ namespace Utility {
 }
 #endif
 
-bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr account)
+bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr account)
 {
+       (void) conf;
     if (!certs) {
         qDebug() << "Certs parameter required but is NULL!";
         return false;

diff --git a/src/gui/sslerrordialog.h b/src/gui/sslerrordialog.h
index 885a1e7b8e2cf0182c7bc1cc53302245a29f048f..68f0fee7e994b2beb96ae02d94b35389af52195b 100644 (file)
--- a/src/gui/sslerrordialog.h
+++ b/src/gui/sslerrordialog.h
@@ -33,7 +33,7 @@ class SslErrorDialog;
 
 class SslDialogErrorHandler : public AbstractSslErrorHandler {
 public:
-    bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr) Q_DECL_OVERRIDE;
+    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr) Q_DECL_OVERRIDE;
 };
 
 class SslErrorDialog : public QDialog

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 990b482d2b4687de936c556f94977e0e544f3029..465ba0c608e8741c571de1e0e8d961e5b09e4035 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -475,7 +475,7 @@ void Account::slotHandleErrors(QNetworkReply *reply , QList<QSslError> errors)
         return;
     }
 
-    if (_sslErrorHandler->handleErrors(errors, &approvedCerts, sharedFromThis())) {
+    if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) {
         QSslSocket::addDefaultCaCertificates(approvedCerts);
         addApprovedCerts(approvedCerts);
         // all ssl certs are known and accepted. We can ignore the problems right away.

diff --git a/src/libsync/account.h b/src/libsync/account.h
index 3d8604f2bdde7c7f28c4d927124af1a6b155ed6d..19af18fa923876823e653230e2164bb0399f2b90 100644 (file)
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -62,7 +62,7 @@ private:
 class AbstractSslErrorHandler {
 public:
     virtual ~AbstractSslErrorHandler() {}
-    virtual bool handleErrors(QList<QSslError>, QList<QSslCertificate>*, AccountPtr) = 0;
+    virtual bool handleErrors(QList<QSslError>, const QSslConfiguration &conf, QList<QSslCertificate>*, AccountPtr) = 0;
 };
 
 /**