whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading certificates on Android with OpenSSL 

Fixes: QTBUG-96606
Change-Id: Ic2a55fa65c5dc3c057a4da25c218af5a9861410e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 504df6b135d4ac17aa2290e1aa943d216fb7ef55)
bb10
Mårten Nordheim 2021-09-20 20:05:30 +02:00
parent ab4fb3ffd4
commit 8910a01c72
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/tls/openssl/qtlsbackend_openssl.cpp
View File

@ -367,7 +367,6 @@ QTlsPrivate::X509Certificate *QTlsBackendOpenSSL::createCertificate() const
namespace QTlsPrivate {
// TLSTODO: remove.
#ifdef Q_OS_ANDROID
QList<QByteArray> fetchSslCertificateData();
#endif
@ -399,7 +398,9 @@ QList<QSslCertificate> systemCaCertificates()
CertCloseStore(hSystemStore, 0);
}
#elif defined(Q_OS_ANDROID)
// TODO: find where it hides its system certs !
const QList<QByteArray> certData = fetchSslCertificateData();
for (auto certDatum : certData)
systemCerts.append(QSslCertificate::fromData(certDatum, QSsl::Der));
#elif defined(Q_OS_UNIX)
{
const QList<QByteArray> directories = QSslSocketPrivate::unixRootCertDirectories();