diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-20 20:05:30 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-21 13:49:59 +0200 |
| commit | 504df6b135d4ac17aa2290e1aa943d216fb7ef55 (patch) | |
| tree | 7bb9021264d4dfe28f245b637a886a8c5315ab38 | |
| parent | 5c78a4e2061f44ac92cfd5e68898a83be1cd216e (diff) | |
Fix loading certificates on Android with OpenSSL
Pick-to: 6.2 dev
Fixes: QTBUG-96606
Change-Id: Ic2a55fa65c5dc3c057a4da25c218af5a9861410e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| -rw-r--r-- | src/plugins/tls/openssl/qtlsbackend_openssl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp index 128c0c5686..1aa15b6d11 100644 --- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp +++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp @@ -361,7 +361,6 @@ QTlsPrivate::X509Certificate *QTlsBackendOpenSSL::createCertificate() const namespace QTlsPrivate { -// TLSTODO: remove. #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) QList<QByteArray> fetchSslCertificateData(); #endif @@ -392,6 +391,10 @@ QList<QSslCertificate> systemCaCertificates() } CertCloseStore(hSystemStore, 0); } +#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) + const QList<QByteArray> certData = fetchSslCertificateData(); + for (auto certDatum : certData) + systemCerts.append(QSslCertificate::fromData(certDatum, QSsl::Der)); #elif defined(Q_OS_UNIX) QSet<QString> certFiles; QDir currentDir; |