mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-06 01:05:23 +08:00
qt 6.6.0 clean
This commit is contained in:
@ -26,6 +26,8 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace
|
||||
@ -127,8 +129,8 @@ private:
|
||||
DtlsPtr clientCrypto;
|
||||
|
||||
QTestEventLoop testLoop;
|
||||
const int handshakeTimeoutMS = 5000;
|
||||
const int dataExchangeTimeoutMS = 1000;
|
||||
static constexpr auto HandshakeTimeout = 5s;
|
||||
static constexpr auto DataExchangeTimeout = 1s;
|
||||
|
||||
const QByteArray presharedKey = "DEADBEEFDEADBEEF";
|
||||
QString certDirPath;
|
||||
@ -413,7 +415,7 @@ void tst_QDtls::handshake()
|
||||
QDTLS_VERIFY_NO_ERROR(clientCrypto);
|
||||
QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeInProgress);
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
@ -473,7 +475,7 @@ void tst_QDtls::handshakeWithRetransmission()
|
||||
// client will re-transmit in 1s., the first part of 'ServerHello' to be
|
||||
// dropped, the client then will re-transmit after another 2 s. Thus it's ~3.
|
||||
// We err on safe side and double our (already quite generous) 5s.
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS * 2);
|
||||
testLoop.enterLoop(HandshakeTimeout * 2);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
|
||||
@ -496,7 +498,7 @@ void tst_QDtls::sessionCipher()
|
||||
QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName));
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
|
||||
@ -559,7 +561,7 @@ void tst_QDtls::cipherPreferences()
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
QDTLS_VERIFY_NO_ERROR(clientCrypto);
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
|
||||
@ -634,7 +636,7 @@ void tst_QDtls::protocolVersionMatching()
|
||||
QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
if (works) {
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
|
||||
@ -669,7 +671,7 @@ void tst_QDtls::verificationErrors()
|
||||
// Now we are ready for handshake:
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QDTLS_VERIFY_NO_ERROR(serverCrypto);
|
||||
@ -739,7 +741,7 @@ void tst_QDtls::presetExpectedErrors()
|
||||
QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
@ -826,7 +828,7 @@ void tst_QDtls::verifyServerCertificate()
|
||||
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
if (serverKey.isNull() && !serverCerts.isEmpty()) {
|
||||
@ -956,7 +958,7 @@ void tst_QDtls::verifyClientCertificate()
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
QDTLS_VERIFY_NO_ERROR(clientCrypto);
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
serverConfig = serverCrypto->dtlsConfiguration();
|
||||
|
||||
@ -1003,7 +1005,7 @@ void tst_QDtls::blacklistedCerificate()
|
||||
QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, name));
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QCOMPARE(clientCrypto->handshakeState(), QDtls::PeerVerificationFailed);
|
||||
QCOMPARE(clientCrypto->dtlsError(), QDtlsError::PeerVerificationError);
|
||||
@ -1055,7 +1057,7 @@ void tst_QDtls::readWriteEncrypted()
|
||||
QCOMPARE(clientCrypto->dtlsError(), QDtlsError::InvalidOperation);
|
||||
|
||||
// 1.2 Finish the handshake:
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
|
||||
@ -1073,7 +1075,7 @@ void tst_QDtls::readWriteEncrypted()
|
||||
QVERIFY(clientBytesWritten > 0);
|
||||
|
||||
// 5. Exchange client/server messages:
|
||||
testLoop.enterLoopMSecs(dataExchangeTimeoutMS);
|
||||
testLoop.enterLoop(DataExchangeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
QCOMPARE(serverExpectedPlainText, serverReceivedPlainText);
|
||||
@ -1091,7 +1093,7 @@ void tst_QDtls::readWriteEncrypted()
|
||||
QCOMPARE(crypto->handshakeState(), QDtls::HandshakeNotStarted);
|
||||
QVERIFY(!crypto->isConnectionEncrypted());
|
||||
// 8. Receive this read notification and handle it:
|
||||
testLoop.enterLoopMSecs(dataExchangeTimeoutMS);
|
||||
testLoop.enterLoop(DataExchangeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
DtlsPtr &peerCrypto = serverSideShutdown ? clientCrypto : serverCrypto;
|
||||
@ -1116,7 +1118,7 @@ void tst_QDtls::datagramFragmentation()
|
||||
|
||||
QVERIFY(clientCrypto->doHandshake(&clientSocket));
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
|
||||
QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
|
||||
|
@ -22,6 +22,8 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#define STOP_ON_FAILURE \
|
||||
@ -76,7 +78,7 @@ private:
|
||||
quint16 serverPort = 0;
|
||||
|
||||
QTestEventLoop testLoop;
|
||||
int handshakeTimeoutMS = 500;
|
||||
static constexpr auto HandshakeTimeout = 500ms;
|
||||
|
||||
QDtlsClientVerifier listener;
|
||||
using HandshakePtr = QSharedPointer<QDtls>;
|
||||
@ -327,7 +329,7 @@ void tst_QDtlsCookie::verifyMultipleClients()
|
||||
|
||||
clientsToAdd = clientsToWait = 100;
|
||||
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS * clientsToWait);
|
||||
testLoop.enterLoop(HandshakeTimeout * clientsToWait);
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QVERIFY(clientsToWait == 0);
|
||||
}
|
||||
@ -351,7 +353,7 @@ void tst_QDtlsCookie::receiveMessage(QUdpSocket *socket, QByteArray *message,
|
||||
Q_ASSERT(socket && message);
|
||||
|
||||
if (socket->pendingDatagramSize() <= 0)
|
||||
testLoop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
testLoop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!testLoop.timeout());
|
||||
QVERIFY(socket->pendingDatagramSize());
|
||||
|
@ -28,6 +28,8 @@
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
// NOTE: the word 'subject' in the code below means the subject of a status request,
|
||||
// so in general it's our peer's certificate we are asking about.
|
||||
|
||||
@ -386,7 +388,7 @@ private:
|
||||
void (QSslSocket::*tlsErrorsSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
|
||||
void (QTestEventLoop::*exitLoopSlot)() = &QTestEventLoop::exitLoop;
|
||||
|
||||
const int handshakeTimeoutMS = 500;
|
||||
static constexpr auto HandshakeTimeout = 500ms;
|
||||
QTestEventLoop loop;
|
||||
|
||||
std::vector<QSslError::SslError> ocspErrorCodes = {QSslError::OcspNoResponseFound,
|
||||
@ -462,7 +464,7 @@ void tst_QOcsp::connectSelfSigned()
|
||||
auto roots = clientConfig.caCertificates();
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
|
||||
@ -478,7 +480,7 @@ void tst_QOcsp::connectSelfSigned()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY_HANDSHAKE_WITHOUT_ERRORS(clientSocket);
|
||||
|
||||
@ -543,7 +545,7 @@ void tst_QOcsp::badStatus()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QCOMPARE_SINGLE_ERROR(clientSocket, expectedError.error());
|
||||
@ -574,7 +576,7 @@ void tst_QOcsp::multipleSingleResponses()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(responderChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
|
||||
@ -594,7 +596,7 @@ void tst_QOcsp::malformedResponse()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(serverChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QCOMPARE(clientSocket.error(), QAbstractSocket::SslHandshakeFailedError);
|
||||
@ -633,7 +635,7 @@ void tst_QOcsp::expiredResponse()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
|
||||
@ -664,7 +666,7 @@ void tst_QOcsp::noNextUpdate()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY_HANDSHAKE_WITHOUT_ERRORS(clientSocket);
|
||||
}
|
||||
@ -710,7 +712,7 @@ void tst_QOcsp::wrongCertificateInResponse()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QVERIFY(containsError(clientSocket.sslHandshakeErrors(), expectedError));
|
||||
@ -735,7 +737,7 @@ void tst_QOcsp::untrustedResponder()
|
||||
QSslSocket clientSocket;
|
||||
setupOcspClient(clientSocket, {}, server.peerVerifyName());
|
||||
clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
|
||||
loop.enterLoopMSecs(handshakeTimeoutMS);
|
||||
loop.enterLoop(HandshakeTimeout);
|
||||
|
||||
QVERIFY(!clientSocket.isEncrypted());
|
||||
QVERIFY(containsError(clientSocket.sslHandshakeErrors(), expectedError));
|
||||
|
@ -102,7 +102,31 @@ private slots:
|
||||
#endif // QT_CONFIG(ssl)
|
||||
private:
|
||||
QString testDataDir;
|
||||
bool isNonOpenSslTls = false;
|
||||
|
||||
enum class TLSBackend {
|
||||
OpenSSL,
|
||||
Schannel,
|
||||
SecureTransport,
|
||||
CertOnly,
|
||||
Unknown,
|
||||
};
|
||||
static TLSBackend currentBackend()
|
||||
{
|
||||
static TLSBackend activeBackend = []() {
|
||||
using namespace Qt::StringLiterals;
|
||||
const QString active = QSslSocket::activeBackend();
|
||||
if (active == "openssl"_L1)
|
||||
return TLSBackend::OpenSSL;
|
||||
if (active == "schannel")
|
||||
return TLSBackend::Schannel;
|
||||
if (active == "securetransport")
|
||||
return TLSBackend::SecureTransport;
|
||||
if (active == "cert-only")
|
||||
return TLSBackend::CertOnly;
|
||||
return TLSBackend::Unknown;
|
||||
}();
|
||||
return activeBackend;
|
||||
}
|
||||
};
|
||||
|
||||
void tst_QSslCertificate::initTestCase()
|
||||
@ -113,8 +137,6 @@ void tst_QSslCertificate::initTestCase()
|
||||
if (!testDataDir.endsWith(QLatin1String("/")))
|
||||
testDataDir += QLatin1String("/");
|
||||
|
||||
isNonOpenSslTls = QSslSocket::activeBackend() != QStringLiteral("openssl");
|
||||
|
||||
QDir dir(testDataDir + "certificates");
|
||||
const QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable);
|
||||
QRegularExpression rxCert(QLatin1String("^.+\\.(pem|der)$"));
|
||||
@ -451,7 +473,7 @@ void tst_QSslCertificate::subjectInfoToString()
|
||||
QVERIFY(testInfo(QSslCertificate::DistinguishedNameQualifier, QString()));
|
||||
QVERIFY(testInfo(QSslCertificate::SerialNumber, QString()));
|
||||
// TODO: check why generic code does not handle this!
|
||||
if (!isNonOpenSslTls)
|
||||
if (currentBackend() == TLSBackend::OpenSSL)
|
||||
QVERIFY(testInfo(QSslCertificate::EmailAddress, QStringLiteral("ababic@trolltech.com")));
|
||||
}
|
||||
|
||||
@ -463,9 +485,8 @@ void tst_QSslCertificate::subjectIssuerDisplayName_data()
|
||||
QTest::addRow("CommonName") << QStringLiteral("more-certificates/cert-cn.pem") << QStringLiteral("YOUR name");
|
||||
QTest::addRow("OrganizationName") << QStringLiteral("more-certificates/cert-on.pem") << QStringLiteral("R&D");
|
||||
QTest::addRow("OrganizationUnitName") << QStringLiteral("more-certificates/cert-oun.pem") << QStringLiteral("Foundations");
|
||||
#ifndef QT_NO_OPENSSL
|
||||
QTest::addRow("NoSubjectName") << QStringLiteral("more-certificates/cert-noname.pem") << QString();
|
||||
#endif
|
||||
if (currentBackend() == TLSBackend::OpenSSL)
|
||||
QTest::addRow("NoSubjectName") << QStringLiteral("more-certificates/cert-noname.pem") << QString();
|
||||
}
|
||||
|
||||
void tst_QSslCertificate::subjectIssuerDisplayName()
|
||||
@ -875,7 +896,7 @@ void tst_QSslCertificate::task256066toPem()
|
||||
|
||||
void tst_QSslCertificate::nulInCN()
|
||||
{
|
||||
if (isNonOpenSslTls)
|
||||
if (currentBackend() != TLSBackend::OpenSSL)
|
||||
QSKIP("Generic QSslCertificatePrivate fails this test");
|
||||
|
||||
QList<QSslCertificate> certList =
|
||||
@ -895,7 +916,7 @@ void tst_QSslCertificate::nulInCN()
|
||||
void tst_QSslCertificate::nulInSan()
|
||||
{
|
||||
|
||||
if (isNonOpenSslTls)
|
||||
if (currentBackend() != TLSBackend::OpenSSL)
|
||||
QSKIP("Generic QSslCertificatePrivate fails this test");
|
||||
|
||||
QList<QSslCertificate> certList =
|
||||
@ -962,7 +983,7 @@ void tst_QSslCertificate::selfsignedCertificates()
|
||||
|
||||
void tst_QSslCertificate::toText()
|
||||
{
|
||||
if (isNonOpenSslTls)
|
||||
if (currentBackend() != TLSBackend::OpenSSL)
|
||||
QSKIP("QSslCertificate::toText is not implemented on platforms which do not use openssl");
|
||||
|
||||
QList<QSslCertificate> certList =
|
||||
@ -1012,7 +1033,7 @@ void tst_QSslCertificate::subjectAndIssuerAttributes()
|
||||
|
||||
QByteArray shortName("1.3.6.1.4.1.311.60.2.1.3");
|
||||
#if !defined(QT_NO_OPENSSL) && defined(SN_jurisdictionCountryName)
|
||||
if (!isNonOpenSslTls)
|
||||
if (currentBackend() == TLSBackend::OpenSSL)
|
||||
shortName = SN_jurisdictionCountryName;
|
||||
#endif
|
||||
attributes = certList[0].subjectInfoAttributes();
|
||||
@ -1021,8 +1042,8 @@ void tst_QSslCertificate::subjectAndIssuerAttributes()
|
||||
|
||||
void tst_QSslCertificate::verify()
|
||||
{
|
||||
if (isNonOpenSslTls)
|
||||
QSKIP("Not implemented in SecureTransport or Schannel");
|
||||
if (currentBackend() != TLSBackend::OpenSSL)
|
||||
QSKIP("Only implemented for OpenSSL");
|
||||
|
||||
QList<QSslError> errors;
|
||||
QList<QSslCertificate> toVerify;
|
||||
@ -1363,9 +1384,8 @@ void tst_QSslCertificate::pkcs12()
|
||||
return;
|
||||
}
|
||||
|
||||
#if !defined(QT_NO_OPENSSL) && OPENSSL_VERSION_MAJOR >= 3
|
||||
QSKIP("leaf.p12 is using RC2, which is disabled by default in OpenSSL v >= 3");
|
||||
#endif
|
||||
if (currentBackend() == TLSBackend::OpenSSL && QSslSocket::sslLibraryVersionNumber() >= 0x30000000L)
|
||||
QSKIP("leaf.p12 is using RC2, which is disabled by default in OpenSSL v >= 3");
|
||||
|
||||
QFile f(testDataDir + QLatin1String("pkcs12/leaf.p12"));
|
||||
bool ok = f.open(QIODevice::ReadOnly);
|
||||
@ -1375,8 +1395,8 @@ void tst_QSslCertificate::pkcs12()
|
||||
QSslCertificate cert;
|
||||
QList<QSslCertificate> caCerts;
|
||||
|
||||
if (isNonOpenSslTls)
|
||||
QEXPECT_FAIL("", "pkcs12 imports are only supported when openssl is used", Abort); // TODO?
|
||||
if (currentBackend() != TLSBackend::OpenSSL)
|
||||
QEXPECT_FAIL("", "pkcs12 imports are not available with the current TLS backend", Abort); // TODO?
|
||||
|
||||
ok = QSslCertificate::importPkcs12(&f, &key, &cert, &caCerts);
|
||||
QVERIFY(ok);
|
||||
@ -1408,7 +1428,8 @@ void tst_QSslCertificate::pkcs12()
|
||||
QFile nocert(testDataDir + QLatin1String("pkcs12/leaf-nokey.p12"));
|
||||
ok = nocert.open(QIODevice::ReadOnly);
|
||||
QVERIFY(ok);
|
||||
QTest::ignoreMessage(QtWarningMsg, "Unable to convert private key");
|
||||
if (currentBackend() == TLSBackend::OpenSSL)
|
||||
QTest::ignoreMessage(QtWarningMsg, "Unable to convert private key");
|
||||
ok = QSslCertificate::importPkcs12(&nocert, &key, &cert, &caCerts);
|
||||
QVERIFY(!ok);
|
||||
nocert.close();
|
||||
|
@ -43,6 +43,8 @@
|
||||
#include "private/qsslsocket_p.h"
|
||||
#include "private/qsslconfiguration_p.h"
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_DEPRECATED
|
||||
// make these enum values available without causing deprecation warnings:
|
||||
@ -2840,7 +2842,7 @@ void tst_QSslSocket::closeWhileEmittingSocketError()
|
||||
// Make sure we have some data buffered so that close will try to flush:
|
||||
clientSocket.write(QByteArray(1000000, Qt::Uninitialized));
|
||||
|
||||
QTestEventLoop::instance().enterLoopMSecs(1000);
|
||||
QTestEventLoop::instance().enterLoop(1s);
|
||||
QVERIFY(!QTestEventLoop::instance().timeout());
|
||||
|
||||
QCOMPARE(socketErrorSpy.size(), 1);
|
||||
@ -3100,7 +3102,14 @@ void tst_QSslSocket::blacklistedCertificates()
|
||||
QList<QSslError> sslErrors = receiver->sslHandshakeErrors();
|
||||
QVERIFY(sslErrors.size() > 0);
|
||||
// there are more errors (self signed cert and hostname mismatch), but we only care about the blacklist error
|
||||
QCOMPARE(sslErrors.at(0).error(), QSslError::CertificateBlacklisted);
|
||||
std::optional<QSslError> blacklistedError;
|
||||
for (const QSslError &error : sslErrors) {
|
||||
if (error.error() == QSslError::CertificateBlacklisted) {
|
||||
blacklistedError = error;
|
||||
break;
|
||||
}
|
||||
}
|
||||
QVERIFY2(blacklistedError, "CertificateBlacklisted error not found!");
|
||||
}
|
||||
|
||||
void tst_QSslSocket::versionAccessors()
|
||||
@ -4577,7 +4586,7 @@ void tst_QSslSocket::unsupportedProtocols()
|
||||
return;
|
||||
|
||||
QFETCH(const QSsl::SslProtocol, unsupportedProtocol);
|
||||
const int timeoutMS = 500;
|
||||
constexpr auto timeout = 500ms;
|
||||
// Test a client socket.
|
||||
{
|
||||
// 0. connectToHostEncrypted: client-side, non-blocking API, error is discovered
|
||||
@ -4599,7 +4608,7 @@ void tst_QSslSocket::unsupportedProtocols()
|
||||
QCOMPARE(socket.error(), QAbstractSocket::UnknownSocketError);
|
||||
|
||||
socket.connectToHost(QHostAddress::LocalHost, server.serverPort());
|
||||
QVERIFY(socket.waitForConnected(timeoutMS));
|
||||
QVERIFY(socket.waitForConnected(int(timeout.count())));
|
||||
|
||||
socket.setProtocol(unsupportedProtocol);
|
||||
socket.startClientEncryption();
|
||||
@ -4624,7 +4633,7 @@ void tst_QSslSocket::unsupportedProtocols()
|
||||
|
||||
QTcpSocket client;
|
||||
client.connectToHost(QHostAddress::LocalHost, server.serverPort());
|
||||
loop.enterLoopMSecs(timeoutMS);
|
||||
loop.enterLoop(timeout);
|
||||
QVERIFY(!loop.timeout());
|
||||
QVERIFY(server.socket);
|
||||
QCOMPARE(server.socket->error(), QAbstractSocket::SslInvalidUserDataError);
|
||||
@ -4731,7 +4740,7 @@ void tst_QSslSocket::alertMissingCertificate()
|
||||
connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
|
||||
connect(&server, &SslServer::socketError, earlyQuitter);
|
||||
|
||||
runner.enterLoopMSecs(1000);
|
||||
runner.enterLoop(1s);
|
||||
|
||||
if (clientSocket.isEncrypted()) {
|
||||
// When using TLS 1.3 the client side thinks it is connected very
|
||||
@ -4739,7 +4748,7 @@ void tst_QSslSocket::alertMissingCertificate()
|
||||
// inevitable disconnect.
|
||||
QCOMPARE(clientSocket.sessionProtocol(), QSsl::TlsV1_3);
|
||||
connect(&clientSocket, &QSslSocket::disconnected, &runner, &QTestEventLoop::exitLoop);
|
||||
runner.enterLoopMSecs(10000);
|
||||
runner.enterLoop(10s);
|
||||
}
|
||||
|
||||
QVERIFY(serverSpy.size() > 0);
|
||||
@ -4794,7 +4803,7 @@ void tst_QSslSocket::alertInvalidCertificate()
|
||||
connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
|
||||
connect(&server, &SslServer::socketError, earlyQuitter);
|
||||
|
||||
runner.enterLoopMSecs(1000);
|
||||
runner.enterLoop(1s);
|
||||
|
||||
QVERIFY(serverSpy.size() > 0);
|
||||
QVERIFY(clientSpy.size() > 0);
|
||||
@ -4922,7 +4931,7 @@ void tst_QSslSocket::selfSignedCertificates()
|
||||
connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
|
||||
connect(&server, &SslServer::socketError, earlyQuitter);
|
||||
|
||||
runner.enterLoopMSecs(1000);
|
||||
runner.enterLoop(1s);
|
||||
|
||||
if (clientKnown) {
|
||||
QCOMPARE(serverSpy.size(), 0);
|
||||
@ -5060,7 +5069,7 @@ void tst_QSslSocket::pskHandshake()
|
||||
connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
|
||||
connect(&server, &SslServer::socketError, earlyQuitter);
|
||||
|
||||
runner.enterLoopMSecs(1000);
|
||||
runner.enterLoop(1s);
|
||||
|
||||
if (pskRight) {
|
||||
QCOMPARE(serverSpy.size(), 0);
|
||||
|
Reference in New Issue
Block a user