1 files changed, 52 insertions, 6 deletions

diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index 28476fce5b..059efae63d 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 #include <qsslkey.h>
 #include <qsslsocket.h>
+#include <QScopeGuard>
 
 #include <QtNetwork/qhostaddress.h>
 #include <QtNetwork/qnetworkproxy.h>
@@ -233,15 +234,50 @@ void tst_QSslKey::constructorHandle()
     QByteArray passphrase;
     if (QByteArray(QTest::currentDataTag()).contains("-pkcs8-"))
         passphrase = "1234";
+
     BIO* bio = q_BIO_new(q_BIO_s_mem());
     q_BIO_write(bio, pem.constData(), pem.length());
-    QSslKey key(func(bio, nullptr, nullptr, static_cast<void *>(passphrase.data())), type);
+    EVP_PKEY *origin = func(bio, nullptr, nullptr, static_cast<void *>(passphrase.data()));
+#if QT_CONFIG(opensslv11)
+    q_EVP_PKEY_up_ref(origin);
+#endif
+    QSslKey key(origin, type);
+#if !QT_CONFIG(opensslv11)
+    q_BIO_write(bio, pem.constData(), pem.length());
+    origin = func(bio, nullptr, nullptr, static_cast<void *>(passphrase.data()));
+#endif
     q_BIO_free(bio);
 
+    EVP_PKEY *handle = q_EVP_PKEY_new();
+    switch (algorithm) {
+    case QSsl::Rsa:
+        q_EVP_PKEY_set1_RSA(handle, static_cast<RSA *>(key.handle()));
+        break;
+    case QSsl::Dsa:
+        q_EVP_PKEY_set1_DSA(handle, static_cast<DSA *>(key.handle()));
+        break;
+    case QSsl::Dh:
+        q_EVP_PKEY_set1_DH(handle, static_cast<DH *>(key.handle()));
+        break;
+#ifndef OPENSSL_NO_EC
+    case QSsl::Ec:
+        q_EVP_PKEY_set1_EC_KEY(handle, static_cast<EC_KEY *>(key.handle()));
+        break;
+#endif
+    default:
+        break;
+    }
+
+    auto cleanup = qScopeGuard([origin, handle] {
+        q_EVP_PKEY_free(origin);
+        q_EVP_PKEY_free(handle);
+    });
+
     QVERIFY(!key.isNull());
     QCOMPARE(key.algorithm(), algorithm);
     QCOMPARE(key.type(), type);
     QCOMPARE(key.length(), length);
+    QCOMPARE(q_EVP_PKEY_cmp(origin, handle), 1);
 #endif
 }
 
@@ -430,15 +466,25 @@ void tst_QSslKey::toEncryptedPemOrDer()
 void tst_QSslKey::passphraseChecks_data()
 {
     QTest::addColumn<QString>("fileName");
-
-    QTest::newRow("DES") << (testDataDir + "rsa-with-passphrase-des.pem");
-    QTest::newRow("3DES") << (testDataDir + "rsa-with-passphrase-3des.pem");
-    QTest::newRow("RC2") << (testDataDir + "rsa-with-passphrase-rc2.pem");
+    QTest::addColumn<QByteArray>("passphrase");
+
+    const QByteArray pass("123");
+    const QByteArray aesPass("1234");
+
+    QTest::newRow("DES") << QString(testDataDir + "rsa-with-passphrase-des.pem") << pass;
+    QTest::newRow("3DES") << QString(testDataDir + "rsa-with-passphrase-3des.pem") << pass;
+    QTest::newRow("RC2") << QString(testDataDir + "rsa-with-passphrase-rc2.pem") << pass;
+#if (!defined(QT_NO_OPENSSL) && !defined(OPENSSL_NO_AES)) || defined(QT_SECURETRANSPORT) || QT_CONFIG(schannel)
+    QTest::newRow("AES128") << QString(testDataDir + "rsa-with-passphrase-aes128.pem") << aesPass;
+    QTest::newRow("AES192") << QString(testDataDir + "rsa-with-passphrase-aes192.pem") << aesPass;
+    QTest::newRow("AES256") << QString(testDataDir + "rsa-with-passphrase-aes256.pem") << aesPass;
+#endif
 }
 
 void tst_QSslKey::passphraseChecks()
 {
     QFETCH(QString, fileName);
+    QFETCH(QByteArray, passphrase);
 
     QFile keyFile(fileName);
     QVERIFY(keyFile.exists());
@@ -471,7 +517,7 @@ void tst_QSslKey::passphraseChecks()
             keyFile.open(QIODevice::ReadOnly);
         else
             keyFile.reset();
-        QSslKey key(&keyFile,QSsl::Rsa,QSsl::Pem, QSsl::PrivateKey, "123");
+        QSslKey key(&keyFile,QSsl::Rsa,QSsl::Pem, QSsl::PrivateKey, passphrase);
         QVERIFY(!key.isNull()); // correct passphrase
     }
 }