diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2023-05-18 19:22:23 +0200 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-05-18 19:22:23 +0200 |
| commit | 238b8357a313dcb90c86f95a0d52c99dee444875 (patch) | |
| tree | 4fd3b6a51ba8d24d1243db91abf1f49f3bd4c225 /modules/websocket | |
| parent | 7d5d5b7bd10f6fad498ec6764a3aac9745f96e1d (diff) | |
[TLS] Fix crashes trying to use TLS when not available.
If no StreamPeerTLS implementation is available, HTTPClient and
WebSocketPeer will now correctly refuse to connect using TLS returning
ERR_UNAVAILABLE.
Similarly, ENetConnection will refuse to setup DTLS when PacketPeerDTLS
is not available.
(cherry picked from commit eeac6f8c7f070a9f4674bfa51ec35c57516311c0)
Diffstat (limited to 'modules/websocket')
| -rw-r--r-- | modules/websocket/wsl_peer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp index 8a150c8561..aedc82bfcf 100644 --- a/modules/websocket/wsl_peer.cpp +++ b/modules/websocket/wsl_peer.cpp @@ -332,7 +332,7 @@ void WSLPeer::_do_client_handshake() { if (connection == tcp) { // Start SSL handshake tls = Ref<StreamPeerTLS>(StreamPeerTLS::create()); - ERR_FAIL_COND_MSG(tls.is_null(), "SSL is not available in this build."); + ERR_FAIL_COND(tls.is_null()); if (tls->connect_to_stream(tcp, requested_host, tls_options) != OK) { close(-1); return; // Error. @@ -504,6 +504,8 @@ Error WSLPeer::connect_to_url(const String &p_url, Ref<TLSOptions> p_options) { path = "/"; } + ERR_FAIL_COND_V_MSG(use_tls && !StreamPeerTLS::is_available(), ERR_UNAVAILABLE, "WSS is not available in this build."); + requested_url = p_url; requested_host = host; |