From 734ab493f7c05e06f4c8bc99884d8a99612c79c0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 4 Mar 2021 10:52:44 +0100 Subject: Fix a BIC introduced by extending the namespace QSsl in _p.h files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed the private part of the namespace to QTlsPrivate. Fixes: QTBUG-91531 Change-Id: Id2d9c458d8d958b35e437eee42889177dad0a7a7 Reviewed-by: Mårten Nordheim (cherry picked from commit e4efa00c72c7011f4e5c27722c2a522b30274610) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp | 50 +++++++++++++------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp') diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index eda43ecd50..e5ce31440b 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -614,7 +614,9 @@ Q_DECLARE_METATYPE(QSslKeyPrivate::Cipher) void tst_QSslKey::encrypt_data() { - QTest::addColumn("cipher"); + using QTlsPrivate::Cipher; + + QTest::addColumn("cipher"); QTest::addColumn("key"); QTest::addColumn("plainText"); QTest::addColumn("cipherText"); @@ -622,91 +624,91 @@ void tst_QSslKey::encrypt_data() QByteArray iv("abcdefgh"); QTest::newRow("DES-CBC, length 0") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray() << QByteArray::fromHex("956585228BAF9B1F") << iv; QTest::newRow("DES-CBC, length 1") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(1, 'a') << QByteArray::fromHex("E6880AF202BA3C12") << iv; QTest::newRow("DES-CBC, length 2") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(2, 'a') << QByteArray::fromHex("A82492386EED6026") << iv; QTest::newRow("DES-CBC, length 3") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(3, 'a') << QByteArray::fromHex("90B76D5B79519CBA") << iv; QTest::newRow("DES-CBC, length 4") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(4, 'a') << QByteArray::fromHex("63E3DD6FED87052A") << iv; QTest::newRow("DES-CBC, length 5") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(5, 'a') << QByteArray::fromHex("03ACDB0EACBDFA94") << iv; QTest::newRow("DES-CBC, length 6") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(6, 'a') << QByteArray::fromHex("7D95024E42A3A88A") << iv; QTest::newRow("DES-CBC, length 7") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(7, 'a') << QByteArray::fromHex("5003436B8A8E42E9") << iv; QTest::newRow("DES-CBC, length 8") - << QSsl::Cipher::DesCbc << QByteArray("01234567") + << Cipher::DesCbc << QByteArray("01234567") << QByteArray(8, 'a') << QByteArray::fromHex("E4C1F054BF5521C0A4A0FD4A2BC6C1B1") << iv; QTest::newRow("DES-EDE3-CBC, length 0") - << QSsl::Cipher::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn") + << Cipher::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn") << QByteArray() << QByteArray::fromHex("3B2B4CD0B0FD495F") << iv; QTest::newRow("DES-EDE3-CBC, length 8") - << QSsl::Cipher::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn") + << Cipher::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn") << QByteArray(8, 'a') << QByteArray::fromHex("F2A5A87763C54A72A3224103D90CDB03") << iv; QTest::newRow("RC2-40-CBC, length 0") - << QSsl::Cipher::Rc2Cbc << QByteArray("01234") + << Cipher::Rc2Cbc << QByteArray("01234") << QByteArray() << QByteArray::fromHex("6D05D52392FF6E7A") << iv; QTest::newRow("RC2-40-CBC, length 8") - << QSsl::Cipher::Rc2Cbc << QByteArray("01234") + << Cipher::Rc2Cbc << QByteArray("01234") << QByteArray(8, 'a') << QByteArray::fromHex("75768E64C5749072A5D168F3AFEB0005") << iv; QTest::newRow("RC2-64-CBC, length 0") - << QSsl::Cipher::Rc2Cbc << QByteArray("01234567") + << Cipher::Rc2Cbc << QByteArray("01234567") << QByteArray() << QByteArray::fromHex("ADAE6BF70F420130") << iv; QTest::newRow("RC2-64-CBC, length 8") - << QSsl::Cipher::Rc2Cbc << QByteArray("01234567") + << Cipher::Rc2Cbc << QByteArray("01234567") << QByteArray(8, 'a') << QByteArray::fromHex("C7BF5C80AFBE9FBEFBBB9FD935F6D0DF") << iv; QTest::newRow("RC2-128-CBC, length 0") - << QSsl::Cipher::Rc2Cbc << QByteArray("012345679abcdefg") + << Cipher::Rc2Cbc << QByteArray("012345679abcdefg") << QByteArray() << QByteArray::fromHex("1E965D483A13C8FB") << iv; QTest::newRow("RC2-128-CBC, length 8") - << QSsl::Cipher::Rc2Cbc << QByteArray("012345679abcdefg") + << Cipher::Rc2Cbc << QByteArray("012345679abcdefg") << QByteArray(8, 'a') << QByteArray::fromHex("5AEC1A5B295660B02613454232F7DECE") << iv; @@ -715,34 +717,34 @@ void tst_QSslKey::encrypt_data() // AES needs a longer IV iv = QByteArray("abcdefghijklmnop"); QTest::newRow("AES-128-CBC, length 0") - << QSsl::Cipher::Aes128Cbc << QByteArray("012345679abcdefg") + << Cipher::Aes128Cbc << QByteArray("012345679abcdefg") << QByteArray() << QByteArray::fromHex("28DE1A9AA26601C30DD2527407121D1A") << iv; QTest::newRow("AES-128-CBC, length 8") - << QSsl::Cipher::Aes128Cbc << QByteArray("012345679abcdefg") + << Cipher::Aes128Cbc << QByteArray("012345679abcdefg") << QByteArray(8, 'a') << QByteArray::fromHex("08E880B1BA916F061C1E801D7F44D0EC") << iv; QTest::newRow("AES-192-CBC, length 0") - << QSsl::Cipher::Aes192Cbc << QByteArray("0123456789abcdefghijklmn") + << Cipher::Aes192Cbc << QByteArray("0123456789abcdefghijklmn") << QByteArray() << QByteArray::fromHex("E169E0E205CDC2BA895B7CF6097673B1") << iv; QTest::newRow("AES-192-CBC, length 8") - << QSsl::Cipher::Aes192Cbc << QByteArray("0123456789abcdefghijklmn") + << Cipher::Aes192Cbc << QByteArray("0123456789abcdefghijklmn") << QByteArray(8, 'a') << QByteArray::fromHex("3A227D6A3A13237316D30AA17FF9B0A7") << iv; QTest::newRow("AES-256-CBC, length 0") - << QSsl::Cipher::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv") + << Cipher::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv") << QByteArray() << QByteArray::fromHex("4BAACAA0D22199C97DE206C465B7B14A") << iv; QTest::newRow("AES-256-CBC, length 8") - << QSsl::Cipher::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv") + << Cipher::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv") << QByteArray(8, 'a') << QByteArray::fromHex("879C8C25EC135CDF0B14490A0A7C2F67") << iv; -- cgit v1.2.3