diff options
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket')
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/certs/README | 7 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/certs/fluke.p12 | bin | 2797 -> 0 bytes | |||
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/certs/leaf.p12 | bin | 3821 -> 0 bytes | |||
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 47 |
4 files changed, 0 insertions, 54 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/certs/README b/tests/auto/network/ssl/qsslsocket/certs/README deleted file mode 100644 index 704646c212..0000000000 --- a/tests/auto/network/ssl/qsslsocket/certs/README +++ /dev/null @@ -1,7 +0,0 @@ -The PKCS#12 bundle was created by running: - -openssl pkcs12 -export -in leaf.crt -inkey leaf.key \ - -out leaf.p12 \ - -certfile inter.crt -CAfile ca.crt - -No password was provided. diff --git a/tests/auto/network/ssl/qsslsocket/certs/fluke.p12 b/tests/auto/network/ssl/qsslsocket/certs/fluke.p12 Binary files differdeleted file mode 100644 index f11e550e88..0000000000 --- a/tests/auto/network/ssl/qsslsocket/certs/fluke.p12 +++ /dev/null diff --git a/tests/auto/network/ssl/qsslsocket/certs/leaf.p12 b/tests/auto/network/ssl/qsslsocket/certs/leaf.p12 Binary files differdeleted file mode 100644 index cb89aadb73..0000000000 --- a/tests/auto/network/ssl/qsslsocket/certs/leaf.p12 +++ /dev/null diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 1ed2a98ed7..30a9e19138 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -194,7 +194,6 @@ private slots: void qtbug18498_peek2(); void dhServer(); void ecdhServer(); - void pkcs12(); void setEmptyDefaultConfiguration(); // this test should be last static void exitLoop() @@ -2735,52 +2734,6 @@ void tst_QSslSocket::ecdhServer() QVERIFY(client->state() == QAbstractSocket::ConnectedState); } -void tst_QSslSocket::pkcs12() -{ - if (!QSslSocket::supportsSsl()) { - qWarning("SSL not supported, skipping test"); - return; - } - - QFETCH_GLOBAL(bool, setProxy); - if (setProxy) - return; - - QFile f(QLatin1String(SRCDIR "certs/leaf.p12")); - bool ok = f.open(QIODevice::ReadOnly); - QVERIFY(ok); - - QSslKey key; - QSslCertificate cert; - QList<QSslCertificate> caCerts; - - ok = QSslSocket::importPKCS12(&f, &key, &cert, &caCerts); - QVERIFY(ok); - f.close(); - - QList<QSslCertificate> leafCert = QSslCertificate::fromPath(SRCDIR "certs/leaf.crt"); - QVERIFY(!leafCert.isEmpty()); - - QCOMPARE(cert, leafCert.first()); - - QFile f2(QLatin1String(SRCDIR "certs/leaf.key")); - ok = f2.open(QIODevice::ReadOnly); - QVERIFY(ok); - - QSslKey leafKey(&f2, QSsl::Rsa); - f2.close(); - - QVERIFY(!leafKey.isNull()); - QCOMPARE(key, leafKey); - - QList<QSslCertificate> caCert = QSslCertificate::fromPath(SRCDIR "certs/inter.crt"); - QVERIFY(!caCert.isEmpty()); - - QVERIFY(!caCerts.isEmpty()); - QCOMPARE(caCerts.first(), caCert.first()); - QCOMPARE(caCerts, caCert); -} - void tst_QSslSocket::setEmptyDefaultConfiguration() // this test should be last, as it has some side effects { // used to produce a crash in QSslConfigurationPrivate::deepCopyDefaultConfiguration, QTBUG-13265 |