summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard J. Moore <rich@kde.org>2014-04-06 15:56:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 10:40:50 +0200
commitf41418aeb20ddc190892216a09feb564d2cef5b4 (patch)
tree49e79c814993a05f272f99357e6e12d0b7f20055
parent3a100edc4f912e0f8207e87282227135b90572b0 (diff)
Ensure we initialize things before checking the openssl version.
Task-number: QTBUG-37783 Change-Id: Ie276e597062d8bfc74ef57251ed21a94020e030f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index bcb2254d11..1b3928fdfb 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -569,6 +569,9 @@ void QSslSocketPrivate::ensureInitialized()
long QSslSocketPrivate::sslLibraryVersionNumber()
{
+ if (!supportsSsl())
+ return 0;
+
return q_SSLeay();
}