diff options
author | aavit <eirik.aavitsland@digia.com> | 2013-05-22 16:25:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-23 22:00:46 +0200 |
commit | a3a43abc048d9ca1a50368c1dbb77cc8cf7a61b1 (patch) | |
tree | 44a155629ffb297f2e97231495047d20edc4885a /src/network/ssl/qsslsocket_openssl.cpp | |
parent | 7878eb6ba30a8b84199f3c8fba4cac739e8a788a (diff) |
Fixes: QtNetwork compilation for OpenSSL < 1.0.0
Incorporate some more of the API changes between OpenSSL versions
0.9.8 and 1.0.0.
Task-number: QTBUG-31140
Change-Id: Ie719b34e3ec8751f0fbc07d315e82816c110762c
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 52f683e267..675bd7d9f7 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1594,7 +1594,7 @@ QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certifi #if OPENSSL_VERSION_NUMBER >= 0x10000000L q_sk_push( (_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); #else - q_sk_push( (STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); + q_sk_push( (STACK *)intermediates, reinterpret_cast<char *>(cert.handle())); #endif } } |