From 33c9a1e0bcf9c7ced67d5ec62225d6295671d33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 28 Jan 2020 14:47:36 +0100 Subject: Remove some usage of deprecated QSslCertificate::fromPath The changed function was added in September 2019 in 5.15 branch before the new overload was added and the old one was deprecated, so we can freely change it. Amends 1068d579ee848edf08db5ac611b292c76c30a39b Change-Id: Iff9d72c26ce557c28b188e1754daa03fd061d531 Reviewed-by: Timur Pocheptsov --- src/network/ssl/qsslconfiguration.cpp | 4 +++- src/network/ssl/qsslconfiguration.h | 2 +- src/network/ssl/qsslsocket.cpp | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/network/ssl') diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index a2e694ec92..d0674042b8 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -660,6 +660,8 @@ void QSslConfiguration::setCaCertificates(const QList &certific } /*! + \since 5.15 + Searches all files in the \a path for certificates encoded in the specified \a format and adds them to this socket's CA certificate database. \a path must be a file or a pattern matching one or more @@ -675,7 +677,7 @@ void QSslConfiguration::setCaCertificates(const QList &certific \sa addCaCertificate(), QSslCertificate::fromPath() */ bool QSslConfiguration::addCaCertificates(const QString &path, QSsl::EncodingFormat format, - QRegExp::PatternSyntax syntax) + QSslCertificate::PatternSyntax syntax) { QList certs = QSslCertificate::fromPath(path, format, syntax); if (certs.isEmpty()) diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 247f3aecc9..09616098a5 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -132,7 +132,7 @@ public: QList caCertificates() const; void setCaCertificates(const QList &certificates); bool addCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); + QSslCertificate::PatternSyntax syntax = QSslCertificate::FixedString); void addCaCertificate(const QSslCertificate &certificate); void addCaCertificates(const QList &certificates); diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index cf971a30bf..19be48a656 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1417,7 +1417,10 @@ bool QSslSocket::addCaCertificates(const QString &path, QSsl::EncodingFormat for QRegExp::PatternSyntax syntax) { Q_D(QSslSocket); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; @@ -2361,7 +2364,10 @@ bool QSslSocketPrivate::addDefaultCaCertificates(const QString &path, QSsl::Enco QRegExp::PatternSyntax syntax) { QSslSocketPrivate::ensureInitialized(); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QList certs = QSslCertificate::fromPath(path, format, syntax); +QT_WARNING_POP if (certs.isEmpty()) return false; -- cgit v1.2.3