diff options
Diffstat (limited to 'tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp')
| -rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index 329e3e367d..ee2b05aada 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -32,6 +32,7 @@ #include <qsslkey.h> #include <qsslsocket.h> #include <qsslcertificateextension.h> +#include <qscopeguard.h> #ifndef QT_NO_OPENSSL #include <openssl/obj_mac.h> @@ -1000,11 +1001,15 @@ void tst_QSslCertificate::verify() // Verify a valid cert signed by a CA QList<QSslCertificate> caCerts = QSslCertificate::fromPath(testDataDir + "verify-certs/cacert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString); - -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QSslSocket::addDefaultCaCertificate(caCerts.first()); -QT_WARNING_POP + // For the purpose of this test only, add (and then remove) the + // specific CA certificate. + const auto defaultConfig = QSslConfiguration::defaultConfiguration(); + auto temporaryDefault = defaultConfig; + temporaryDefault.addCaCertificate(caCerts.first()); + QSslConfiguration::setDefaultConfiguration(temporaryDefault); + const auto confGuard = qScopeGuard([&defaultConfig](){ + QSslConfiguration::setDefaultConfiguration(defaultConfig); + }); toVerify = QSslCertificate::fromPath(testDataDir + "verify-certs/test-ocsp-good-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString); |