Changeset View
Changeset View
Standalone View
Standalone View
src/core/tcpslavebase.cpp
Show All 20 Lines | |||||
21 | * You should have received a copy of the GNU Library General Public License | 21 | * You should have received a copy of the GNU Library General Public License | ||
22 | * along with this library; see the file COPYING.LIB. If not, write to | 22 | * along with this library; see the file COPYING.LIB. If not, write to | ||
23 | * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 23 | * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
24 | * Boston, MA 02110-1301, USA. | 24 | * Boston, MA 02110-1301, USA. | ||
25 | */ | 25 | */ | ||
26 | 26 | | |||
27 | #include "tcpslavebase.h" | 27 | #include "tcpslavebase.h" | ||
28 | #include "kiocoredebug.h" | 28 | #include "kiocoredebug.h" | ||
29 | #include "ksslerror_p.h" | ||||
29 | 30 | | |||
30 | #include <kconfiggroup.h> | 31 | #include <kconfiggroup.h> | ||
31 | #include <ksslcertificatemanager.h> | 32 | #include <ksslcertificatemanager.h> | ||
32 | #include <ksslsettings.h> | 33 | #include <ksslsettings.h> | ||
33 | #include <klocalizedstring.h> | 34 | #include <klocalizedstring.h> | ||
34 | 35 | | |||
35 | #include <QSslCipher> | 36 | #include <QSslCipher> | ||
36 | #include <QSslSocket> | 37 | #include <QSslSocket> | ||
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s) | 101 | for (int i = 0; i < sslErrors.count(); i++) { | |||
103 | } | 104 | } | ||
104 | } | 105 | } | ||
105 | 106 | | |||
106 | QString errorStr; | 107 | QString errorStr; | ||
107 | // encode the two-dimensional numeric error list using '\n' and '\t' as outer and inner separators | 108 | // encode the two-dimensional numeric error list using '\n' and '\t' as outer and inner separators | ||
108 | for (const QSslCertificate &cert : peerCertificateChain ) { | 109 | for (const QSslCertificate &cert : peerCertificateChain ) { | ||
109 | for (const KSslError &error : qAsConst(sslErrors)) { | 110 | for (const KSslError &error : qAsConst(sslErrors)) { | ||
110 | if (error.certificate() == cert) { | 111 | if (error.certificate() == cert) { | ||
111 | errorStr += QString::number(static_cast<int>(error.error())) + QLatin1Char('\t'); | 112 | errorStr += QString::number(static_cast<int>(KSslErrorPrivate::errorFromKSslError(error.error()))) + QLatin1Char('\t'); | ||
112 | } | 113 | } | ||
113 | } | 114 | } | ||
114 | if (errorStr.endsWith(QLatin1Char('\t'))) { | 115 | if (errorStr.endsWith(QLatin1Char('\t'))) { | ||
115 | errorStr.chop(1); | 116 | errorStr.chop(1); | ||
116 | } | 117 | } | ||
117 | errorStr += QLatin1Char('\n'); | 118 | errorStr += QLatin1Char('\n'); | ||
118 | } | 119 | } | ||
119 | errorStr.chop(1); | 120 | errorStr.chop(1); | ||
▲ Show 20 Lines • Show All 813 Lines • Show Last 20 Lines |