1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSslCertificate: don't init() if SSL is not supported

Browse Source 
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>
This commit is contained in:
Jüri Valdmann 2017-05-05 15:18:46 +02:00 committed by Timur Pocheptsov
parent c70c1d54f4
commit 8632614947
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/ssl/qsslcertificate.cpp
View File

@ -143,7 +143,7 @@ QSslCertificate::QSslCertificate(QIODevice *device, QSsl::EncodingFormat format)
: d(new QSslCertificatePrivate) : d(new QSslCertificatePrivate)
{ {
QSslSocketPrivate::ensureInitialized(); QSslSocketPrivate::ensureInitialized();
if (device) if (device && QSslSocket::supportsSsl())
d->init(device->readAll(), format); d->init(device->readAll(), format);
} }
@ -157,6 +157,7 @@ QSslCertificate::QSslCertificate(const QByteArray &data, QSsl::EncodingFormat fo
: d(new QSslCertificatePrivate) : d(new QSslCertificatePrivate)
{ {
QSslSocketPrivate::ensureInitialized(); QSslSocketPrivate::ensureInitialized();
if (QSslSocket::supportsSsl())
d->init(data, format); d->init(data, format);
} }