diff options
| author | Richard J. Moore <rich@kde.org> | 2015-02-08 12:02:18 +0000 |
|---|---|---|
| committer | Daniel Molkentin <daniel@molkentin.de> | 2015-02-08 20:47:39 +0000 |
| commit | 9f59341d070c62e6dbf8d1d06593ca72beaf9811 (patch) | |
| tree | f6248241f8b0dd92b3c67da4f3d0899c7d729f5f /src/network/ssl/qsslcertificate_openssl.cpp | |
| parent | d12f65a66a67972d0373dc50bf40baf37d08066a (diff) | |
Remove legacy ifdefs for ancient openssl.
There were still ifdefs for openssl 0.9.7 and openssl 0.9.8f.
[ChangeLog][QtNetwork] Some legacy ifdefs for openssl 0.9.7 and openssl 0.9.8f
were removed, Qt will no longer build with these versions. In addition there
is no support for openssl built with NO_TLSEXT.
Change-Id: I9268515c0a125a2f6d79add8ee1cb40768e7e898
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Diffstat (limited to 'src/network/ssl/qsslcertificate_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate_openssl.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp index 4cb2e525eb..f73a16147a 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp @@ -673,11 +673,7 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromPem(const QByteAr QByteArray decoded = QByteArray::fromBase64( QByteArray::fromRawData(pem.data() + startPos, endPos - startPos)); -#if OPENSSL_VERSION_NUMBER >= 0x00908000L const unsigned char *data = (const unsigned char *)decoded.data(); -#else - unsigned char *data = (unsigned char *)decoded.data(); -#endif if (X509 *x509 = q_d2i_X509(0, &data, decoded.size())) { certificates << QSslCertificate_from_X509(x509); @@ -693,12 +689,7 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr QList<QSslCertificate> certificates; QSslSocketPrivate::ensureInitialized(); - -#if OPENSSL_VERSION_NUMBER >= 0x00908000L - const unsigned char *data = (const unsigned char *)der.data(); -#else - unsigned char *data = (unsigned char *)der.data(); -#endif + const unsigned char *data = (const unsigned char *)der.data(); int size = der.size(); while (size > 0 && (count == -1 || certificates.size() < count)) { |