drop SSL support

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
fluxer · Feb 21, 2022 · fba2c21 · fba2c21 · barracuda156 · Jan 20, 2024
1 parent 808d94b
commit fba2c21
Show file tree

Hide file tree

Showing 35 changed files with 19 additions and 7,665 deletions.
diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist
@@ -1133,13 +1133,6 @@ include/katie/QtNetwork/QNetworkInterface
 include/katie/QtNetwork/QNetworkProxy
 include/katie/QtNetwork/QNetworkProxyFactory
 include/katie/QtNetwork/QNetworkProxyQuery
-include/katie/QtNetwork/QSsl
-include/katie/QtNetwork/QSslCertificate
-include/katie/QtNetwork/QSslCipher
-include/katie/QtNetwork/QSslConfiguration
-include/katie/QtNetwork/QSslError
-include/katie/QtNetwork/QSslKey
-include/katie/QtNetwork/QSslSocket
 include/katie/QtNetwork/QTcpServer
 include/katie/QtNetwork/QTcpSocket
 include/katie/QtNetwork/QUdpSocket
@@ -1155,13 +1148,6 @@ include/katie/QtNetwork/qlocalserver.h
 include/katie/QtNetwork/qlocalsocket.h
 include/katie/QtNetwork/qnetworkinterface.h
 include/katie/QtNetwork/qnetworkproxy.h
-include/katie/QtNetwork/qssl.h
-include/katie/QtNetwork/qsslcertificate.h
-include/katie/QtNetwork/qsslcipher.h
-include/katie/QtNetwork/qsslconfiguration.h
-include/katie/QtNetwork/qsslerror.h
-include/katie/QtNetwork/qsslkey.h
-include/katie/QtNetwork/qsslsocket.h
 include/katie/QtNetwork/qtcpserver.h
 include/katie/QtNetwork/qtcpsocket.h
 include/katie/QtNetwork/qudpsocket.h

diff --git a/package/netbsd/PLIST b/package/netbsd/PLIST
@@ -1136,13 +1136,6 @@ include/katie/QtNetwork/QNetworkInterface
 include/katie/QtNetwork/QNetworkProxy
 include/katie/QtNetwork/QNetworkProxyFactory
 include/katie/QtNetwork/QNetworkProxyQuery
-include/katie/QtNetwork/QSsl
-include/katie/QtNetwork/QSslCertificate
-include/katie/QtNetwork/QSslCipher
-include/katie/QtNetwork/QSslConfiguration
-include/katie/QtNetwork/QSslError
-include/katie/QtNetwork/QSslKey
-include/katie/QtNetwork/QSslSocket
 include/katie/QtNetwork/QTcpServer
 include/katie/QtNetwork/QTcpSocket
 include/katie/QtNetwork/QUdpSocket
@@ -1158,13 +1151,6 @@ include/katie/QtNetwork/qlocalserver.h
 include/katie/QtNetwork/qlocalsocket.h
 include/katie/QtNetwork/qnetworkinterface.h
 include/katie/QtNetwork/qnetworkproxy.h
-include/katie/QtNetwork/qssl.h
-include/katie/QtNetwork/qsslcertificate.h
-include/katie/QtNetwork/qsslcipher.h
-include/katie/QtNetwork/qsslconfiguration.h
-include/katie/QtNetwork/qsslerror.h
-include/katie/QtNetwork/qsslkey.h
-include/katie/QtNetwork/qsslsocket.h
 include/katie/QtNetwork/qtcpserver.h
 include/katie/QtNetwork/qtcpsocket.h
 include/katie/QtNetwork/qudpsocket.h

diff --git a/package/openbsd/pkg/PLIST b/package/openbsd/pkg/PLIST
@@ -1142,13 +1142,6 @@ include/katie/QtNetwork/QNetworkInterface
 include/katie/QtNetwork/QNetworkProxy
 include/katie/QtNetwork/QNetworkProxyFactory
 include/katie/QtNetwork/QNetworkProxyQuery
-include/katie/QtNetwork/QSsl
-include/katie/QtNetwork/QSslCertificate
-include/katie/QtNetwork/QSslCipher
-include/katie/QtNetwork/QSslConfiguration
-include/katie/QtNetwork/QSslError
-include/katie/QtNetwork/QSslKey
-include/katie/QtNetwork/QSslSocket
 include/katie/QtNetwork/QTcpServer
 include/katie/QtNetwork/QTcpSocket
 include/katie/QtNetwork/QUdpSocket
@@ -1164,13 +1157,6 @@ include/katie/QtNetwork/qlocalserver.h
 include/katie/QtNetwork/qlocalsocket.h
 include/katie/QtNetwork/qnetworkinterface.h
 include/katie/QtNetwork/qnetworkproxy.h
-include/katie/QtNetwork/qssl.h
-include/katie/QtNetwork/qsslcertificate.h
-include/katie/QtNetwork/qsslcipher.h
-include/katie/QtNetwork/qsslconfiguration.h
-include/katie/QtNetwork/qsslerror.h
-include/katie/QtNetwork/qsslkey.h
-include/katie/QtNetwork/qsslsocket.h
 include/katie/QtNetwork/qtcpserver.h
 include/katie/QtNetwork/qtcpsocket.h
 include/katie/QtNetwork/qudpsocket.h

diff --git a/scripts/namefsck.py b/scripts/namefsck.py
@@ -508,13 +508,6 @@
     "QSplitter",
     "QSplitterHandle",
     "QSpontaneKeyEvent",
-    "QSsl",
-    "QSslCertificate",
-    "QSslCipher",
-    "QSslConfiguration",
-    "QSslError",
-    "QSslKey",
-    "QSslSocket",
     "QStack",
     "QStackedLayout",
     "QStackedWidget",

diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -37,7 +37,6 @@
 #include <QBuffer>
 #include <QDebug>
 #include "qobject_p.h"
-#include <QSslError>
 
 #define IMAGEREQUEST_MAX_REQUEST_COUNT       8
 #define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -13,13 +13,6 @@ set(NETWORK_PUBLIC_HEADERS
     QLocalSocket
     QNetworkInterface
     QNetworkProxy
-    QSsl
-    QSslCertificate
-    QSslCipher
-    QSslConfiguration
-    QSslError
-    QSslKey
-    QSslSocket
     QTcpServer
     QTcpSocket
     QUdpSocket
@@ -60,18 +53,6 @@ set(NETWORK_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qlocalsocket_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qnativesocketengine_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qnet_unix_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qssl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcertificate.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcertificate_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslconfiguration.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslconfiguration_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcipher.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcipher_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslerror.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslkey.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket_openssl_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qnetworkcommon_p.h
 )
 
@@ -96,14 +77,6 @@ set(NETWORK_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qnativesocketengine_unix.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qlocalsocket_unix.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/socket/qlocalserver_unix.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qssl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcertificate.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslconfiguration.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslcipher.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslerror.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslkey.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket_openssl.cpp
 )
 
 katie_generate_misc("${NETWORK_HEADERS}" QtNetwork)

diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
@@ -95,7 +95,7 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
 
   The Digest-MD5 authentication mechanism supports no outgoing options.
 
-  \sa QSslSocket
+  \sa QTcpSocket
 */
 
 

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
@@ -280,8 +280,6 @@
            IPv6 support).
     \value ProxyAuthenticationRequiredError The socket is using a proxy, and
            the proxy requires authentication.
-    \value SslHandshakeFailedError The SSL/TLS handshake failed, so
-           the connection was closed (only used in QSslSocket) (This value was introduced in 4.4.)
     \value UnfinishedSocketOperationError Used by QAbstractSocketEngine only,
            The last operation attempted has not finished yet (still in progress in
             the background). (This value was introduced in 4.4.)
@@ -357,7 +355,6 @@
 #include "qtimer.h"
 #include "qelapsedtimer.h"
 #include "qscopedvaluerollback.h"
-#include "qsslsocket.h"
 #include "qdebug.h"
 #include "qthread_p.h"
 #include "qcore_unix_p.h"
@@ -1915,7 +1912,6 @@ bool QAbstractSocket::atEnd() const
 
     \sa write(), waitForBytesWritten()
 */
-// Note! docs copied to QSslSocket::flush()
 bool QAbstractSocket::flush()
 {
     Q_D(QAbstractSocket);
@@ -2545,9 +2541,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QAbstractSocket::SocketError er
     case QAbstractSocket::ProxyAuthenticationRequiredError:
         debug << "QAbstractSocket::ProxyAuthenticationRequiredError";
         break;
-    case QAbstractSocket::SslHandshakeFailedError:
-        debug << "QAbstractSocket::SslHandshakeFailedError";
-        break;
     case QAbstractSocket::ProxyConnectionRefusedError:
         debug << "QAbstractSocket::ProxyConnectionRefusedError";
         break;

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
@@ -68,10 +68,9 @@ class Q_NETWORK_EXPORT QAbstractSocket : public QIODevice
         UnsupportedSocketOperationError,        /* 10 */
         UnfinishedSocketOperationError,
         ProxyAuthenticationRequiredError,
-        SslHandshakeFailedError,
         ProxyConnectionRefusedError,
-        ProxyConnectionClosedError,             /* 15 */
-        ProxyConnectionTimeoutError,
+        ProxyConnectionClosedError,
+        ProxyConnectionTimeoutError,            /* 15 */
         ProxyNotFoundError,
         ProxyProtocolError,
 

diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp