Changeset View
Changeset View
Standalone View
Standalone View
src/core/ksslcertificatemanager.cpp
Show First 20 Lines • Show All 123 Lines • ▼ Show 20 Line(s) | |||||
124 | 124 | | |||
125 | bool KSslCertificateRule::isErrorIgnored(KSslError::Error error) const | 125 | bool KSslCertificateRule::isErrorIgnored(KSslError::Error error) const | ||
126 | { | 126 | { | ||
127 | return d->ignoredErrors.contains(KSslErrorPrivate::errorFromKSslError(error)); | 127 | return d->ignoredErrors.contains(KSslErrorPrivate::errorFromKSslError(error)); | ||
128 | } | 128 | } | ||
129 | 129 | | |||
130 | bool KSslCertificateRule::isErrorIgnored(QSslError::SslError error) const | 130 | bool KSslCertificateRule::isErrorIgnored(QSslError::SslError error) const | ||
131 | { | 131 | { | ||
132 | return d->ignoredErrors.contains(error); | 132 | // ### temporary porting scafolding, remove the KSslError conversion roundtrip once kssld is ported | ||
133 | // until then we need to do this here to avoid comparing QSslErrors that haven't been reduced to the | ||||
134 | // lower KSslError level of detail with the values stored as KSslError | ||||
135 | //return d->ignoredErrors.contains(error); | ||||
136 | return d->ignoredErrors.contains(KSslErrorPrivate::errorFromKSslError(KSslErrorPrivate::errorFromQSslError(error))); | ||||
133 | } | 137 | } | ||
134 | 138 | | |||
135 | void KSslCertificateRule::setIgnoredErrors(const QList<KSslError::Error> &errors) | 139 | void KSslCertificateRule::setIgnoredErrors(const QList<KSslError::Error> &errors) | ||
136 | { | 140 | { | ||
137 | d->ignoredErrors.clear(); | 141 | d->ignoredErrors.clear(); | ||
138 | //### Quadratic runtime, woohoo! Use a QSet if that should ever be an issue. | 142 | //### Quadratic runtime, woohoo! Use a QSet if that should ever be an issue. | ||
139 | for (KSslError::Error e : errors) { | 143 | for (KSslError::Error e : errors) { | ||
140 | QSslError::SslError error = KSslErrorPrivate::errorFromKSslError(e); | 144 | QSslError::SslError error = KSslErrorPrivate::errorFromKSslError(e); | ||
▲ Show 20 Lines • Show All 397 Lines • Show Last 20 Lines |