diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-03 11:41:22 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-09-05 14:20:44 +0200 |
| commit | 070fcf9ce1ef3c2912bd15f1f39db9740cc754c6 (patch) | |
| tree | 3447d1878ad60d451f247f2cbb18964dc0000cc9 /tests/auto | |
| parent | 2e667c9171f141c6ee0a279aae4479d4414c99f3 (diff) | |
ssl: common certificate parser support for extensions
This makes non-OpenSSL backends able to handle to certificate
extensions.
This also converts the Q_OS_WINRT #ifdef's in the unit test to
QT_NO_OPENSSL as the behavior is the same for any non-OpenSSL
backend.
Change-Id: I6a8306dc5c97a659ec96063d5a59cee2ee9a63a9
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index 56530acb14..229ce4abb5 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -928,7 +928,7 @@ void tst_QSslCertificate::toText() QString txtcert = cert.toText(); -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: QSslCertificate::toText is not implemented on WinRT", Continue); #endif QVERIFY(QString::fromLatin1(txt098) == txtcert || @@ -976,7 +976,7 @@ void tst_QSslCertificate::verify() qPrintable(QString("errors: %1").arg(toString(errors))) \ ) -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not yet support verifying a chain", Abort); #endif // Empty chain is unspecified error @@ -1060,9 +1060,6 @@ void tst_QSslCertificate::extensions() QSslCertificate cert = certList[0]; QList<QSslCertificateExtension> extensions = cert.extensions(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support extensions information", Abort); -#endif QVERIFY(extensions.count() == 9); int unknown_idx = -1; @@ -1161,9 +1158,6 @@ void tst_QSslCertificate::extensionsCritical() QSslCertificate cert = certList[0]; QList<QSslCertificateExtension> extensions = cert.extensions(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support extensions information", Abort); -#endif QVERIFY(extensions.count() == 9); int basic_constraints_idx = -1; @@ -1314,7 +1308,7 @@ void tst_QSslCertificate::pkcs12() QSslCertificate cert; QList<QSslCertificate> caCerts; -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support pkcs12 imports", Abort); #endif ok = QSslCertificate::importPKCS12(&f, &key, &cert, &caCerts); |