amass/qt6windows7
1
0
Fork 0
mirror of https://github.com/crystalidea/qt6windows7.git synced 2025-07-04 16:25:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

6.5.3 clean

Browse Source
This commit is contained in:
kleuter
2023-11-01 18:02:52 +01:00
parent bbe896803b
commit 7018d9e6c8
2170 changed files with 57471 additions and 43550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/network/ssl/qasn1element/CMakeLists.txt
View File

@ -11,4 +11,5 @@ qt_internal_add_test(tst_qasn1element
LIBRARIES
Qt::Network
Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qdtls/CMakeLists.txt
View File

@ -14,4 +14,5 @@ qt_internal_add_test(tst_qdtls
LIBRARIES
Qt::NetworkPrivate
TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
)

26
tests/auto/network/ssl/qdtls/tst_qdtls.cpp
View File

@ -579,28 +579,36 @@ void tst_QDtls::protocolVersionMatching_data()
QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
QTest::addColumn<bool>("works");
//OPENSSL_VERSION_NUMBER :
//(OPENSSL_VERSION_MAJOR<<28) | (OPENSSL_VERSION_MINOR<<20) | (OPENSSL_VERSION_PATCH<<4)
const long ossl311 = 0x30100010;
if (QSslSocket::sslLibraryVersionNumber() < ossl311) {
#if QT_DEPRECATED_SINCE(6, 3)
QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED
QTest::addRow("DtlsV1_0 <-> DtlsV1_0") << QSsl::DtlsV1_0 << QSsl::DtlsV1_0 << true;
QTest::addRow("DtlsV1_0OrLater <-> DtlsV1_0") << QSsl::DtlsV1_0OrLater << QSsl::DtlsV1_0 << true;
QTest::addRow("DtlsV1_0 <-> DtlsV1_0OrLater") << QSsl::DtlsV1_0 << QSsl::DtlsV1_0OrLater << true;
QTest::addRow("DtlsV1_0OrLater <-> DtlsV1_0OrLater") << QSsl::DtlsV1_0OrLater << QSsl::DtlsV1_0OrLater << true;
QTest::addRow("DtlsV1_0 <-> DtlsV1_0") << QSsl::DtlsV1_0 << QSsl::DtlsV1_0 << true;
QTest::addRow("DtlsV1_0OrLater <-> DtlsV1_0") << QSsl::DtlsV1_0OrLater << QSsl::DtlsV1_0 << true;
QTest::addRow("DtlsV1_0 <-> DtlsV1_0OrLater") << QSsl::DtlsV1_0 << QSsl::DtlsV1_0OrLater << true;
QTest::addRow("DtlsV1_0OrLater <-> DtlsV1_0OrLater") << QSsl::DtlsV1_0OrLater << QSsl::DtlsV1_0OrLater << true;
QT_WARNING_POP
#endif // QT_DEPRECATED_SINCE(6, 3)
}
QTest::addRow("DtlsV1_2 <-> DtlsV1_2") << QSsl::DtlsV1_2 << QSsl::DtlsV1_2 << true;
QTest::addRow("DtlsV1_2OrLater <-> DtlsV1_2") << QSsl::DtlsV1_2OrLater << QSsl::DtlsV1_2 << true;
QTest::addRow("DtlsV1_2 <-> DtlsV1_2OrLater") << QSsl::DtlsV1_2 << QSsl::DtlsV1_2OrLater << true;
QTest::addRow("DtlsV1_2OrLater <-> DtlsV1_2OrLater") << QSsl::DtlsV1_2OrLater << QSsl::DtlsV1_2OrLater << true;
if (QSslSocket::sslLibraryVersionNumber() < ossl311) {
#if QT_DEPRECATED_SINCE(6, 3)
QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED
QTest::addRow("DtlsV1_0 <-> DtlsV1_2") << QSsl::DtlsV1_0 << QSsl::DtlsV1_2 << false;
QTest::addRow("DtlsV1_0 <-> DtlsV1_2OrLater") << QSsl::DtlsV1_0 << QSsl::DtlsV1_2OrLater << false;
QTest::addRow("DtlsV1_2 <-> DtlsV1_0") << QSsl::DtlsV1_2 << QSsl::DtlsV1_0 << false;
QTest::addRow("DtlsV1_2OrLater <-> DtlsV1_0") << QSsl::DtlsV1_2OrLater << QSsl::DtlsV1_0 << false;
QTest::addRow("DtlsV1_0 <-> DtlsV1_2") << QSsl::DtlsV1_0 << QSsl::DtlsV1_2 << false;
QTest::addRow("DtlsV1_0 <-> DtlsV1_2OrLater") << QSsl::DtlsV1_0 << QSsl::DtlsV1_2OrLater << false;
QTest::addRow("DtlsV1_2 <-> DtlsV1_0") << QSsl::DtlsV1_2 << QSsl::DtlsV1_0 << false;
QTest::addRow("DtlsV1_2OrLater <-> DtlsV1_0") << QSsl::DtlsV1_2OrLater << QSsl::DtlsV1_0 << false;
QT_WARNING_POP
#endif // QT_DEPRECATED_SINCE(6, 3)
#endif // QT_DEPRECATED_SINCE(6, 3
}
}
void tst_QDtls::protocolVersionMatching()

1
tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qdtlscookie
tst_qdtlscookie.cpp
LIBRARIES
Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qocsp/CMakeLists.txt
View File

@ -11,6 +11,7 @@ qt_internal_add_test(tst_qocsp
LIBRARIES
Qt::Network
Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
)
qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked

1
tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qpassworddigestor
tst_qpassworddigestor.cpp
LIBRARIES
Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
View File

@ -34,4 +34,5 @@ qt_internal_add_test(tst_qsslcertificate
LIBRARIES
Qt::Network
TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
)

4
tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
View File

@ -116,13 +116,13 @@ void tst_QSslCertificate::initTestCase()
isNonOpenSslTls = QSslSocket::activeBackend() != QStringLiteral("openssl");
QDir dir(testDataDir + "certificates");
QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable);
const QFileInfoList fileInfoList = dir.entryInfoList(QDir::Files | QDir::Readable);
QRegularExpression rxCert(QLatin1String("^.+\\.(pem|der)$"));
QRegularExpression rxSan(QLatin1String("^(.+\\.(?:pem|der))\\.san$"));
QRegularExpression rxPubKey(QLatin1String("^(.+\\.(?:pem|der))\\.pubkey$"));
QRegularExpression rxDigest(QLatin1String("^(.+\\.(?:pem|der))\\.digest-(md5|sha1)$"));
QRegularExpressionMatch match;
foreach (QFileInfo fileInfo, fileInfoList) {
for (const QFileInfo &fileInfo : fileInfoList) {
if ((match = rxCert.match(fileInfo.fileName())).hasMatch())
certInfoList <<
CertInfo(fileInfo,

1
tests/auto/network/ssl/qsslcipher/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslcipher
tst_qsslcipher.cpp
LIBRARIES
Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qssldiffiehellmanparameters
tst_qssldiffiehellmanparameters.cpp
LIBRARIES
Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslellipticcurve
tst_qsslellipticcurve.cpp
LIBRARIES
Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qsslerror/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslerror
tst_qsslerror.cpp
LIBRARIES
Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
)

5
tests/auto/network/ssl/qsslkey/CMakeLists.txt
View File

@ -21,9 +21,10 @@ qt_internal_add_test(tst_qsslkey
LIBRARIES
Qt::Network
TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
)
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_developer_build AND QT_FEATURE_openssl_linked
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
@ -31,7 +32,7 @@ qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_
## Scopes:
#####################################################################
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_developer_build
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate

1
tests/auto/network/ssl/qsslserver/CMakeLists.txt
View File

@ -19,4 +19,5 @@ qt_internal_add_test(tst_qsslserver
Qt::CorePrivate
Qt::NetworkPrivate
TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qsslsocket/CMakeLists.txt
View File

@ -21,6 +21,7 @@ qt_internal_add_test(tst_qsslsocket
Qt::TestPrivate
TESTDATA ${test_data}
QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo"
BUNDLE_ANDROID_OPENSSL_LIBS
)
qt_internal_extend_target(tst_qsslsocket CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked

28
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -291,6 +291,7 @@ private:
QSslSocket *socket;
QList<QSslError> storedExpectedSslErrors;
bool isTestingOpenSsl = false;
bool isSecurityLevel0Required = false;
bool opensslResolved = false;
bool isTestingSecureTransport = false;
bool isTestingSchannel = false;
@ -410,6 +411,9 @@ void tst_QSslSocket::initTestCase()
flukeCertificateError = QSslError::SelfSignedCertificate;
#if QT_CONFIG(openssl)
opensslResolved = qt_auto_test_resolve_OpenSSL_symbols();
// This is where OpenSSL moved several protocols under
// non-default (0) security level (the default is 1).
isSecurityLevel0Required = OPENSSL_VERSION_NUMBER >= 0x30100010;
#else
opensslResolved = false; // Not 'unused variable' anymore.
#endif
@ -808,6 +812,10 @@ void tst_QSslSocket::simpleConnect()
if (!QSslSocket::supportsSsl())
return;
// Starting from OpenSSL v 3.1.1 deprecated protocol versions (we want to use when connecting) are not available by default.
if (isSecurityLevel0Required)
QSKIP("Testing with OpenSSL backend, but security level 0 is required for TLS v1.1 or earlier");
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
return;
@ -869,6 +877,10 @@ void tst_QSslSocket::simpleConnectWithIgnore()
if (!QSslSocket::supportsSsl())
return;
// Starting from OpenSSL v 3.1.1 deprecated protocol versions (we want to use when connecting) are not available by default.
if (isSecurityLevel0Required)
QSKIP("Testing with OpenSSL backend, but security level 0 is required for TLS v1.1 or earlier");
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
return;
@ -913,6 +925,10 @@ void tst_QSslSocket::simpleConnectWithIgnore()
void tst_QSslSocket::sslErrors_data()
{
// Starting from OpenSSL v 3.1.1 deprecated protocol versions (we want to use in 'sslErrors' test) are not available by default.
if (isSecurityLevel0Required)
QSKIP("Testing with OpenSSL backend, but security level 0 is required for TLS v1.1 or earlier");
QTest::addColumn<QString>("host");
QTest::addColumn<int>("port");
@ -1294,6 +1310,7 @@ void tst_QSslSocket::privateKey()
#if QT_CONFIG(openssl)
void tst_QSslSocket::privateKeyOpaque()
{
#ifndef OPENSSL_NO_DEPRECATED_3_0
if (!isTestingOpenSsl)
QSKIP("The active TLS backend does not support private opaque keys");
@ -1327,6 +1344,7 @@ void tst_QSslSocket::privateKeyOpaque()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy && !socket->waitForEncrypted(10000))
QSKIP("Skipping flaky test - See QTBUG-29941");
#endif // OPENSSL_NO_DEPRECATED_3_0
}
#endif // Feature 'openssl'.
@ -1965,6 +1983,10 @@ void tst_QSslSocket::waitForConnectedEncryptedReadyRead()
if (!QSslSocket::supportsSsl())
return;
// Starting from OpenSSL v 3.1.1 deprecated protocol versions (we want to use here) are not available by default.
if (isSecurityLevel0Required)
QSKIP("Testing with OpenSSL backend, but security level 0 is required for TLS v1.1 or earlier");
QSslSocketPtr socket = newSocket();
this->socket = socket.data();
@ -3104,6 +3126,10 @@ void tst_QSslSocket::encryptWithoutConnecting()
void tst_QSslSocket::resume_data()
{
// Starting from OpenSSL v 3.1.1 deprecated protocol versions (we want to use in 'resume' test) are not available by default.
if (isSecurityLevel0Required)
QSKIP("Testing with OpenSSL backend, but security level 0 is required for TLS v1.1 or earlier");
QTest::addColumn<bool>("ignoreErrorsAfterPause");
QTest::addColumn<QList<QSslError> >("errorsToIgnore");
QTest::addColumn<bool>("expectSuccess");
@ -3508,6 +3534,8 @@ void tst_QSslSocket::dhServerCustomParams()
{
if (!QSslSocket::supportsSsl())
QSKIP("No SSL support");
if (!QSslSocket::isClassImplemented(QSsl::ImplementedClass::DiffieHellman))
QSKIP("The current backend doesn't support diffie hellman parameters");
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)

1
tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
View File

@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_member
Qt::CorePrivate
Qt::NetworkPrivate
QT_TEST_SERVER_LIST "squid" "danted"
BUNDLE_ANDROID_OPENSSL_LIBS
)

1
tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
View File

@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_static
Qt::CorePrivate
Qt::NetworkPrivate
QT_TEST_SERVER_LIST "squid" "danted"
BUNDLE_ANDROID_OPENSSL_LIBS
)