1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove mentions of SSL 3 in documentation

Browse Source 
And some s,SSL,TLS, in the same paragraphs.
Changing SSL to TLS in the whole codebase looks odd given classes are
still called QSsl*, but may be worth considering at some point.

Change-Id: I06dfcd99c1f6ac9e029e1914363344b3705d871f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 50cff232ce0b3c2c993aed9c2ddbea937009e3db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-05-27 16:47:49 +02:00 committed by Qt Cherry-pick Bot
parent 2c6ac19595
commit e9a0ff7bbd
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/access/qnetworkrequest.cpp
View File

@ -742,9 +742,8 @@ QSslConfiguration QNetworkRequest::sslConfiguration() const
/*! /*!
Sets this network request's SSL configuration to be \a config. The Sets this network request's SSL configuration to be \a config. The
settings that apply are the private key, the local certificate, settings that apply are the private key, the local certificate,
the SSL protocol (SSLv2, SSLv3, TLSv1.0 where applicable), the CA the TLS protocol (e.g. TLS 1.3), the CA certificates and the ciphers that
certificates and the ciphers that the SSL backend is allowed to the SSL backend is allowed to use.
use.
\sa sslConfiguration(), QSslConfiguration::defaultConfiguration() \sa sslConfiguration(), QSslConfiguration::defaultConfiguration()
*/ */

6
src/network/ssl/qsslsocket.cpp
View File

@ -54,10 +54,10 @@
QSslSocket establishes a secure, encrypted TCP connection you can QSslSocket establishes a secure, encrypted TCP connection you can
use for transmitting encrypted data. It can operate in both client use for transmitting encrypted data. It can operate in both client
and server mode, and it supports modern SSL protocols, including and server mode, and it supports modern TLS protocols, including
SSL 3 and TLS 1.2. By default, QSslSocket uses only SSL protocols TLS 1.3. By default, QSslSocket uses only TLS protocols
which are considered to be secure (QSsl::SecureProtocols), but you can which are considered to be secure (QSsl::SecureProtocols), but you can
change the SSL protocol by calling setProtocol() as long as you do change the TLS protocol by calling setProtocol() as long as you do
it before the handshake has started. it before the handshake has started.
SSL encryption operates on top of the existing TCP stream after SSL encryption operates on top of the existing TCP stream after