godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

[Net] Rename StreamPeerSSL to StreamPeerTLS.

Browse Source 
SSL has been deprectated almost 10 years ago.
This commit is contained in:
Fabio Alessandrelli
2022-09-07 00:46:12 +02:00
parent 432c4c40a9
commit 528e791a5f
21 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/websocket/wsl_client.cpp
View File

@@ -288,11 +288,11 @@ void WSLClient::poll() {
break;
case StreamPeerTCP::STATUS_CONNECTED: {
_ip_candidates.clear();
Ref<StreamPeerSSL> ssl;
Ref<StreamPeerTLS> ssl;
if (_use_ssl) {
if (_connection == _tcp) {
// Start SSL handshake
ssl = Ref<StreamPeerSSL>(StreamPeerSSL::create());
ssl = Ref<StreamPeerTLS>(StreamPeerTLS::create());
ERR_FAIL_COND_MSG(ssl.is_null(), "SSL is not available in this build.");
ssl->set_blocking_handshake_enabled(false);
if (ssl->connect_to_stream(_tcp, verify_ssl, _host, ssl_cert) != OK) {
@@ -302,13 +302,13 @@ void WSLClient::poll() {
}
_connection = ssl;
} else {
ssl = static_cast<Ref<StreamPeerSSL>>(_connection);
ssl = static_cast<Ref<StreamPeerTLS>>(_connection);
ERR_FAIL_COND(ssl.is_null()); // Bug?
ssl->poll();
}
if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
if (ssl->get_status() == StreamPeerTLS::STATUS_HANDSHAKING) {
return; // Need more polling.
} else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
} else if (ssl->get_status() != StreamPeerTLS::STATUS_CONNECTED) {
disconnect_from_host();
_on_error();
return; // Error.