diff options
| author | BogDan Vatra <bogdan@kde.org> | 2013-02-08 10:09:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-08 17:37:51 +0100 |
| commit | 934afb5c57fce6d28ce0d7ae8ac1450e8d833b17 (patch) | |
| tree | 4e4343851e02892a08be450f31c24686b2784163 /tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | |
| parent | 2be39c68320ab058ac5428ed1a9f0bb69a6c5893 (diff) | |
Fix loading of SSL certificate of DER files.
DER certificates should not be opened as text files, so we
only pass the QIODevice::Text flag when the format is
QSsl::Pem.
Change-Id: I4bad98023c397b967d5beeec0aaa6c414e06fd9c
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp')
| -rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index 7ee87472a1..74c3f7833b 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -538,7 +538,7 @@ void tst_QSslCertificate::fromPath_data() QTest::newRow("\"certificates/cert*\" wildcard pem") << QString("certificates/cert*") << int(QRegExp::Wildcard) << true << 4; QTest::newRow("\"certificates/cert-[sure]*\" wildcard pem") << QString("certificates/cert-[sure]*") << int(QRegExp::Wildcard) << true << 3; QTest::newRow("\"certificates/cert-[not]*\" wildcard pem") << QString("certificates/cert-[not]*") << int(QRegExp::Wildcard) << true << 0; - QTest::newRow("\"certificates/*\" wildcard der") << QString("certificates/*") << int(QRegExp::Wildcard) << false << 0; + QTest::newRow("\"certificates/*\" wildcard der") << QString("certificates/*") << int(QRegExp::Wildcard) << false << 2; QTest::newRow("\"c*/c*.pem\" fixed pem") << QString("c*/c*.pem") << int(QRegExp::FixedString) << true << 0; QTest::newRow("\"c*/c*.pem\" fixed der") << QString("c*/c*.pem") << int(QRegExp::FixedString) << false << 0; QTest::newRow("\"c*/c*.pem\" regexp pem") << QString("c*/c*.pem") << int(QRegExp::RegExp) << true << 0; @@ -868,11 +868,16 @@ void tst_QSslCertificate::toText() QVERIFY(f101.open(QIODevice::ReadOnly | QFile::Text)); QByteArray txt101 = f101.readAll(); + QFile f101c(testDataDir + "/more-certificates/cert-large-expiration-date.txt.1.0.1c"); + QVERIFY(f101c.open(QIODevice::ReadOnly | QFile::Text)); + QByteArray txt101c = f101c.readAll(); + QString txtcert = cert.toText(); QVERIFY(QString::fromLatin1(txt098) == txtcert || QString::fromLatin1(txt100) == txtcert || - QString::fromLatin1(txt101) == txtcert ); + QString::fromLatin1(txt101) == txtcert || + QString::fromLatin1(txt101c) == txtcert ); } void tst_QSslCertificate::multipleCommonNames() |