From 3c9e3f7dc0137e37b98ce791517b171af8a50c40 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sat, 20 Jan 2024 10:56:20 +0800 Subject: [PATCH 4/5] src/network/ssl: require OpenSSL v0.9.8+ See: https://github.com/fluxer/katie/commit/3f709a65fc11ee84d9fc05a3d0869b927c793713 --- src/network/ssl/qsslcertificate.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git src/network/ssl/qsslcertificate.cpp src/network/ssl/qsslcertificate.cpp index 74614ecbe1..945521c88a 100644 --- src/network/ssl/qsslcertificate.cpp +++ src/network/ssl/qsslcertificate.cpp @@ -759,12 +759,7 @@ QList 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 - + const unsigned char *data = reinterpret_cast(decoded.constData()); if (X509 *x509 = q_d2i_X509(0, &data, decoded.size())) { certificates << QSslCertificate_from_X509(x509); q_X509_free(x509); @@ -779,12 +774,7 @@ QList QSslCertificatePrivate::certificatesFromDer(const QByteAr QList 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 = reinterpret_cast(der.constData()); int size = der.size(); while (count == -1 || certificates.size() < count) {