diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2017-05-05 15:18:46 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-05-30 17:12:59 +0000 |
| commit | 86326149474763a9b7adf109b59c7c4acc74b031 (patch) | |
| tree | 40bcefc64852a70b20e913933947976029371915 /src/network | |
| parent | c70c1d54f437e77f1e75b3f438b4c3dd6f1ce5a0 (diff) | |
QSslCertificate: don't init() if SSL is not supported
QSslCertificate used SSL without checking if SSL is available.
This patch adds such checks to the constructors.
Change-Id: Iea298aded5966641327e22e41ad4665a3d0ec5d3
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index ce78399e01..6433b84e80 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -143,7 +143,7 @@ QSslCertificate::QSslCertificate(QIODevice *device, QSsl::EncodingFormat format) : d(new QSslCertificatePrivate) { QSslSocketPrivate::ensureInitialized(); - if (device) + if (device && QSslSocket::supportsSsl()) d->init(device->readAll(), format); } @@ -157,7 +157,8 @@ QSslCertificate::QSslCertificate(const QByteArray &data, QSsl::EncodingFormat fo : d(new QSslCertificatePrivate) { QSslSocketPrivate::ensureInitialized(); - d->init(data, format); + if (QSslSocket::supportsSsl()) + d->init(data, format); } /*! |