From ce5a3f56a608dcafd33aed6a9f262ed7ca9f01e8 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Fri, 19 Jul 2019 15:29:57 +0200 Subject: Rewrite StreamPeerSSL with SSLContext helper class connect_to_stream now accepts optional parameter to specify which certificates to trust. Implement accept_stream (SSL server) with key/cert parameters to specify the RSA key and X509 certificate resources. --- editor/editor_settings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editor') diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index cb3bfa3a49..ca1387007e 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -1022,7 +1022,8 @@ void EditorSettings::setup_network() { add_property_hint(PropertyInfo(Variant::INT, "network/debug/remote_port", PROPERTY_HINT_RANGE, "1,65535,1")); // Editor SSL certificates override - _initial_set("network/ssl/editor_ssl_certificates", _SYSTEM_CERTS_PATH); + String certs = has_setting("network/ssl/editor_ssl_certificates") ? get("network/ssl/editor_ssl_certificates") : _SYSTEM_CERTS_PATH; + _initial_set("network/ssl/editor_ssl_certificates", certs); add_property_hint(PropertyInfo(Variant::STRING, "network/ssl/editor_ssl_certificates", PROPERTY_HINT_GLOBAL_FILE, "*.crt,*.pem")); } -- cgit v1.2.3