diff --git a/CMakeLists.txt b/CMakeLists.txt index 830d31ea..46606bcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif (CMAKE_COMPILER_IS_GNUCXX) add_definitions(-DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) diff --git a/plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp b/plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp index 8aa6c294..95917cc1 100644 --- a/plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp +++ b/plugins/qca-cyrus-sasl/qca-cyrus-sasl.cpp @@ -677,7 +677,7 @@ public: g->appname = SASL_APP; if(!g->server_init) { - sasl_server_init(NULL, QFile::encodeName(g->appname)); + sasl_server_init(NULL, QFile::encodeName(g->appname).constData()); g->server_init = true; } diff --git a/plugins/qca-logger/qca-logger.cpp b/plugins/qca-logger/qca-logger.cpp index d7170abb..dee72cde 100644 --- a/plugins/qca-logger/qca-logger.cpp +++ b/plugins/qca-logger/qca-logger.cpp @@ -111,7 +111,7 @@ public: printf ("XXXX %s %s\n", level.data (), file.data ()); _externalConfig = true; createLogger ( - atoi (level), + atoi (level.constData()), file.isEmpty () ? QString() : QString::fromUtf8 (file) ); } diff --git a/unittest/certunittest/certunittest.cpp b/unittest/certunittest/certunittest.cpp index 514ba8e3..b2528e63 100644 --- a/unittest/certunittest/certunittest.cpp +++ b/unittest/certunittest/certunittest.cpp @@ -77,7 +77,7 @@ void CertUnitTest::nullCert() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate nullCert; QVERIFY(nullCert.isNull()); @@ -96,7 +96,7 @@ void CertUnitTest::noSuchFile() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultNoFile; QCA::Certificate cert = QCA::Certificate::fromPEMFile( "thisIsJustaFileNameThatWeDontHave", &resultNoFile, provider); @@ -114,7 +114,7 @@ void CertUnitTest::CAcertstest() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultca1; QCA::Certificate ca1 = QCA::Certificate::fromPEMFile( "certs/RootCAcert.pem", &resultca1, provider); @@ -165,7 +165,7 @@ void CertUnitTest::qualitysslcatest() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultca1; QCA::Certificate ca1 = QCA::Certificate::fromPEMFile( "certs/QualitySSLIntermediateCA.crt", &resultca1, provider); @@ -217,7 +217,7 @@ void CertUnitTest::checkExpiredClientCerts() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultClient1; QCA::Certificate client1 = QCA::Certificate::fromPEMFile( "certs/User.pem", &resultClient1, provider); @@ -325,7 +325,7 @@ void CertUnitTest::checkClientCerts() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultClient2; QCA::Certificate client2 = QCA::Certificate::fromPEMFile( "certs/QcaTestClientCert.pem", &resultClient2, provider); @@ -434,7 +434,7 @@ void CertUnitTest::derCAcertstest() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QFile f("certs/ov-root-ca-cert.crt"); QVERIFY(f.open(QFile::ReadOnly)); @@ -508,7 +508,7 @@ void CertUnitTest::altName() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultClient1; QCA::Certificate client1 = QCA::Certificate::fromPEMFile( "certs/altname.pem", &resultClient1, provider); @@ -584,7 +584,7 @@ void CertUnitTest::extXMPP() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultClient1; QCA::Certificate client1 = QCA::Certificate::fromPEMFile( "certs/xmppcert.pem", &resultClient1, provider); @@ -626,7 +626,7 @@ void CertUnitTest::altNames76() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultClient1; QCA::Certificate client1 = QCA::Certificate::fromPEMFile( "certs/76.pem", &resultClient1, provider); @@ -721,7 +721,7 @@ void CertUnitTest::sha256cert() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QFile f("certs/RAIZ2007_CERTIFICATE_AND_CRL_SIGNING_SHA256.crt"); QVERIFY(f.open(QFile::ReadOnly)); @@ -760,7 +760,7 @@ void CertUnitTest::checkExpiredServerCerts() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultServer1; QCA::Certificate server1 = QCA::Certificate::fromPEMFile( "certs/Server.pem", &resultServer1, provider); @@ -863,7 +863,7 @@ void CertUnitTest::checkServerCerts() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultServer1; QCA::Certificate server1 = QCA::Certificate::fromPEMFile( "certs/QcaTestServerCert.pem", &resultServer1, provider); @@ -982,7 +982,7 @@ void CertUnitTest::crl() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "crl", provider ) ) - QWARN( QString( "Certificate revocation not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate revocation not supported for "+provider).toLocal8Bit().constData() ); else { QCA::CRL emptyCRL; QVERIFY( emptyCRL.isNull() ); @@ -1043,7 +1043,7 @@ void CertUnitTest::crl2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "crl", provider ) ) - QWARN( QString( "Certificate revocation not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate revocation not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultCrl; QCA::CRL crl1 = QCA::CRL::fromPEMFile( "certs/GoodCACRL.pem", &resultCrl, provider); @@ -1110,7 +1110,7 @@ void CertUnitTest::csr() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "csr", provider ) ) - QWARN( QString( "Certificate signing requests not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate signing requests not supported for "+provider).toLocal8Bit().constData() ); else { QCA::CertificateRequest nullCSR; QVERIFY( nullCSR.isNull() ); @@ -1154,7 +1154,7 @@ void CertUnitTest::csr2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "csr", provider ) ) - QWARN( QString( "Certificate signing requests not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate signing requests not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult resultCsr; QCA::CertificateRequest csr1 = QCA::CertificateRequest::fromPEMFile( "certs/newreq.pem", &resultCsr, provider); diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp index 05a29fd0..222004b0 100644 --- a/unittest/cms/cms.cpp +++ b/unittest/cms/cms.cpp @@ -79,9 +79,9 @@ void CMSut::xcrypt() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit().constData() ); else if( !QCA::isSupported( "cms", provider ) ) - QWARN( QString( "CMS not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "CMS not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate pubCert = QCA::Certificate::fromPEMFile( "QcaTestClientCert.pem",0, provider ); QCOMPARE( pubCert.isNull(), false ); @@ -178,9 +178,9 @@ void CMSut::signverify() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit().constData() ); else if( !QCA::isSupported( "cms", provider ) ) - QWARN( QString( "CMS not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "CMS not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult res; QCA::SecureArray passPhrase = "start"; @@ -310,9 +310,9 @@ void CMSut::signverify_message() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit().constData() ); else if( !QCA::isSupported( "cms", provider ) ) - QWARN( QString( "CMS not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "CMS not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult res; QCA::SecureArray passPhrase = "start"; @@ -428,9 +428,9 @@ void CMSut::signverify_message_invalid() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate not supported for "+provider).toLocal8Bit().constData() ); else if( !QCA::isSupported( "cms", provider ) ) - QWARN( QString( "CMS not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "CMS not supported for "+provider).toLocal8Bit().constData() ); else { QCA::ConvertResult res; QCA::SecureArray passPhrase = "start"; diff --git a/unittest/macunittest/macunittest.cpp b/unittest/macunittest/macunittest.cpp index cb572b33..846424b4 100644 --- a/unittest/macunittest/macunittest.cpp +++ b/unittest/macunittest/macunittest.cpp @@ -69,7 +69,7 @@ void MACUnitTest::HMACMD5() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(md5)", provider ) ) - QWARN( QString( "HMAC(MD5) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(MD5) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode md5hmacLenTest( "hmac(md5)", QCA::SymmetricKey(), provider ); QCOMPARE( md5hmacLenTest.validKeyLength( 0 ), true ); @@ -149,7 +149,7 @@ void MACUnitTest::HMACSHA256() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(sha256)", provider ) ) - QWARN( QString( "HMAC(SHA256) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(SHA256) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode hmacLenTest( "hmac(sha256)", QCA::SymmetricKey(), provider ); QCOMPARE( hmacLenTest.validKeyLength( 0 ), true ); @@ -233,7 +233,7 @@ void MACUnitTest::HMACSHA224() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(sha224)", provider ) ) - QWARN( QString( "HMAC(SHA224) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(SHA224) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode hmacLenTest( "hmac(sha224)", QCA::SymmetricKey(), provider ); QCOMPARE( hmacLenTest.validKeyLength( 0 ), true ); @@ -318,7 +318,7 @@ void MACUnitTest::HMACSHA384() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(sha384)", provider ) ) - QWARN( QString( "HMAC(SHA384) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(SHA384) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode hmacLenTest( "hmac(sha384)", QCA::SymmetricKey(), provider ); QCOMPARE( hmacLenTest.validKeyLength( 0 ), true ); @@ -403,7 +403,7 @@ void MACUnitTest::HMACSHA512() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(sha512)", provider ) ) - QWARN( QString( "HMAC(SHA512) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(SHA512) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode hmacLenTest( "hmac(sha512)", QCA::SymmetricKey(), provider ); QCOMPARE( hmacLenTest.validKeyLength( 0 ), true ); @@ -488,7 +488,7 @@ void MACUnitTest::HMACSHA1() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(sha1)", provider ) ) - QWARN( QString( "HMAC(SHA1) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(SHA1) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode sha1hmacLenTest( "hmac(sha1)", QCA::SymmetricKey(), provider ); QCOMPARE( sha1hmacLenTest.validKeyLength( 0 ), true ); @@ -566,7 +566,7 @@ void MACUnitTest::HMACRMD160() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "hmac(ripemd160)", provider ) ) - QWARN( QString( "HMAC(RIPEMD160) not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "HMAC(RIPEMD160) not supported for "+provider).toLocal8Bit().constData() ); else { QCA::MessageAuthenticationCode ripemd160hmacLenTest( "hmac(ripemd160)", QCA::SymmetricKey(), provider ); QCOMPARE( ripemd160hmacLenTest.validKeyLength( 0 ), true ); diff --git a/unittest/pkits/pkits.cpp b/unittest/pkits/pkits.cpp index 59537ab6..40a7cc96 100644 --- a/unittest/pkits/pkits.cpp +++ b/unittest/pkits/pkits.cpp @@ -112,7 +112,7 @@ void Pkits::pkits4_1_1() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidCertificatePathTest1EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -149,7 +149,7 @@ void Pkits::pkits4_1_2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidCASignatureTest2EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -186,7 +186,7 @@ void Pkits::pkits4_1_3() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidEESignatureTest3EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -223,7 +223,7 @@ void Pkits::pkits4_1_4() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidDSASignaturesTest4EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -260,7 +260,7 @@ void Pkits::pkits4_1_5() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidDSAParameterInheritanceTest5EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -304,7 +304,7 @@ void Pkits::pkits4_1_6() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidDSASignatureTest6EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -339,7 +339,7 @@ void Pkits::pkits4_2_1() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidCAnotBeforeDateTest1EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -374,7 +374,7 @@ void Pkits::pkits4_2_2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidEEnotBeforeDateTest2EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -409,7 +409,7 @@ void Pkits::pkits4_2_3() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/Validpre2000UTCnotBeforeDateTest3EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -444,7 +444,7 @@ void Pkits::pkits4_2_4() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -480,7 +480,7 @@ void Pkits::pkits4_2_5() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidCAnotAfterDateTest5EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -515,7 +515,7 @@ void Pkits::pkits4_2_6() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidEEnotAfterDateTest6EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -550,7 +550,7 @@ void Pkits::pkits4_2_7() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -585,7 +585,7 @@ void Pkits::pkits4_2_8() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidGeneralizedTimenotAfterDateTest8EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -620,7 +620,7 @@ void Pkits::pkits4_3_1() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidNameChainingTest1EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -655,7 +655,7 @@ void Pkits::pkits4_3_2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidNameChainingOrderTest2EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -690,7 +690,7 @@ void Pkits::pkits4_3_3() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidNameChainingWhitespaceTest3EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -726,7 +726,7 @@ void Pkits::pkits4_3_4() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidNameChainingWhitespaceTest4EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -761,7 +761,7 @@ void Pkits::pkits4_3_5() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidNameChainingCapitalizationTest5EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -796,7 +796,7 @@ void Pkits::pkits4_3_6() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidNameUIDsTest6EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -832,7 +832,7 @@ void Pkits::pkits4_3_7() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -869,7 +869,7 @@ void Pkits::pkits4_3_8() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -905,7 +905,7 @@ void Pkits::pkits4_3_9() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidUTF8StringEncodedNamesTest9EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -941,7 +941,7 @@ void Pkits::pkits4_3_10() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -978,7 +978,7 @@ void Pkits::pkits4_3_11() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -1017,7 +1017,7 @@ void Pkits::pkits4_4_1() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidMissingCRLTest1EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -1052,7 +1052,7 @@ void Pkits::pkits4_4_2() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidRevokedCATest2EE.crt", provider); QCOMPARE( cert.isNull(), false ); @@ -1097,7 +1097,7 @@ void Pkits::pkits4_4_3() foreach(const QString provider, providersToTest) { if( !QCA::isSupported( "cert", provider ) ) - QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit() ); + QWARN( QString( "Certificate handling not supported for "+provider).toLocal8Bit().constData() ); else { QCA::Certificate cert = certFromDERFile("certs/InvalidRevokedEETest3EE.crt", provider); QCOMPARE( cert.isNull(), false ); diff --git a/unittest/rsaunittest/rsaunittest.cpp b/unittest/rsaunittest/rsaunittest.cpp index 2a847b55..23b63254 100644 --- a/unittest/rsaunittest/rsaunittest.cpp +++ b/unittest/rsaunittest/rsaunittest.cpp @@ -64,7 +64,7 @@ void RSAUnitTest::testrsa() if(!QCA::isSupported("pkey", provider) || !QCA::PKey::supportedTypes(provider).contains(QCA::PKey::RSA) || !QCA::PKey::supportedIOTypes(provider).contains(QCA::PKey::RSA)) - QWARN(QString("RSA not supported for "+provider).toLocal8Bit()); + QWARN(QString("RSA not supported for "+provider).toLocal8Bit().constData()); else { QCA::KeyGenerator keygen; QCOMPARE( keygen.isBusy(), false ); @@ -154,7 +154,7 @@ void RSAUnitTest::testAsymmetricEncryption() if(!QCA::isSupported("pkey", "qca-ossl") || !QCA::PKey::supportedTypes("qca-ossl").contains(QCA::PKey::RSA) || !QCA::PKey::supportedIOTypes("qca-ossl").contains(QCA::PKey::RSA)) { - QWARN(QString("RSA not supported").toLocal8Bit()); + QWARN("RSA not supported"); QSKIP("RSA not supported. skipping"); } QCA::RSAPrivateKey rsaPrivKey1 = QCA::KeyGenerator().createRSA(512, 65537, "qca-ossl").toRSA();