diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-08-29 15:18:32 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-09-28 02:22:21 +0000 |
| commit | cd60b787651ac682595fe40f40c8778c518c5517 (patch) | |
| tree | 230a517c9db4504dc059d53c61e50e6f8a4a00c8 /src/network/ssl | |
| parent | 9c72ae61aa28c1e26c7ada21b2853273976a093d (diff) | |
wasm: enable Network for nothread
Task-number: QTBUG-70208
Change-Id: Ib73ca0d3c0736336bf517ffb968cbdbab4610319
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslcertificate_openssl.cpp | 19 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 4 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp index e87264c972..fa87cfeaaf 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp @@ -44,8 +44,9 @@ #include "qsslkey_p.h" #include "qsslcertificateextension_p.h" +#if QT_CONFIG(thread) #include <QtCore/private/qmutexpool_p.h> - +#endif QT_BEGIN_NAMESPACE // forward declaration @@ -90,7 +91,9 @@ bool QSslCertificate::isSelfSigned() const QByteArray QSslCertificate::version() const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif if (d->versionString.isEmpty() && d->x509) d->versionString = QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); @@ -99,7 +102,9 @@ QByteArray QSslCertificate::version() const QByteArray QSslCertificate::serialNumber() const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif if (d->serialNumberString.isEmpty() && d->x509) { ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); QByteArray hexString; @@ -116,7 +121,9 @@ QByteArray QSslCertificate::serialNumber() const QStringList QSslCertificate::issuerInfo(SubjectInfo info) const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->issuerInfo.isEmpty() && d->x509) d->issuerInfo = @@ -127,7 +134,9 @@ QStringList QSslCertificate::issuerInfo(SubjectInfo info) const QStringList QSslCertificate::issuerInfo(const QByteArray &attribute) const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->issuerInfo.isEmpty() && d->x509) d->issuerInfo = @@ -138,7 +147,9 @@ QStringList QSslCertificate::issuerInfo(const QByteArray &attribute) const QStringList QSslCertificate::subjectInfo(SubjectInfo info) const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->subjectInfo.isEmpty() && d->x509) d->subjectInfo = @@ -149,7 +160,9 @@ QStringList QSslCertificate::subjectInfo(SubjectInfo info) const QStringList QSslCertificate::subjectInfo(const QByteArray &attribute) const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->subjectInfo.isEmpty() && d->x509) d->subjectInfo = @@ -160,7 +173,9 @@ QStringList QSslCertificate::subjectInfo(const QByteArray &attribute) const QList<QByteArray> QSslCertificate::subjectInfoAttributes() const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->subjectInfo.isEmpty() && d->x509) d->subjectInfo = @@ -171,7 +186,9 @@ QList<QByteArray> QSslCertificate::subjectInfoAttributes() const QList<QByteArray> QSslCertificate::issuerInfoAttributes() const { +#if QT_CONFIG(thread) QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +#endif // lazy init if (d->issuerInfo.isEmpty() && d->x509) d->issuerInfo = diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 63cb276d54..8af9b5d77e 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -63,7 +63,9 @@ # include <QtCore/qlibrary.h> #endif #include <QtCore/qmutex.h> +#if QT_CONFIG(thread) #include <private/qmutexpool_p.h> +#endif #include <QtCore/qdatetime.h> #if defined(Q_OS_UNIX) #include <QtCore/qdir.h> @@ -903,11 +905,13 @@ bool q_resolveOpenSslSymbols() { static bool symbolsResolved = false; static bool triedToResolveSymbols = false; +#if QT_CONFIG(thread) #if QT_CONFIG(opensslv11) QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl)); #else QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init)); #endif +#endif if (symbolsResolved) return true; if (triedToResolveSymbols) |