Commit c6fbbdf1 by Hugo Locurcio

Rename SSL certificate bundle setting to clarify the "overriding" aspect

parent 6731e1f9
...@@ -233,8 +233,8 @@ void register_core_settings() { ...@@ -233,8 +233,8 @@ void register_core_settings() {
GLOBAL_DEF_RST("network/limits/packet_peer_stream/max_buffer_po2", (16)); GLOBAL_DEF_RST("network/limits/packet_peer_stream/max_buffer_po2", (16));
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/packet_peer_stream/max_buffer_po2", PropertyInfo(Variant::INT, "network/limits/packet_peer_stream/max_buffer_po2", PROPERTY_HINT_RANGE, "0,64,1,or_greater")); ProjectSettings::get_singleton()->set_custom_property_info("network/limits/packet_peer_stream/max_buffer_po2", PropertyInfo(Variant::INT, "network/limits/packet_peer_stream/max_buffer_po2", PROPERTY_HINT_RANGE, "0,64,1,or_greater"));
GLOBAL_DEF("network/ssl/certificates", ""); GLOBAL_DEF("network/ssl/certificate_bundle_override", "");
ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificates", PropertyInfo(Variant::STRING, "network/ssl/certificates", PROPERTY_HINT_FILE, "*.crt")); ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificate_bundle_override", PropertyInfo(Variant::STRING, "network/ssl/certificate_bundle_override", PROPERTY_HINT_FILE, "*.crt"));
} }
void register_core_singletons() { void register_core_singletons() {
......
...@@ -874,8 +874,9 @@ ...@@ -874,8 +874,9 @@
<member name="network/remote_fs/page_size" type="int" setter="" getter="" default="65536"> <member name="network/remote_fs/page_size" type="int" setter="" getter="" default="65536">
Page size used by remote filesystem (in bytes). Page size used by remote filesystem (in bytes).
</member> </member>
<member name="network/ssl/certificates" type="String" setter="" getter="" default="&quot;&quot;"> <member name="network/ssl/certificate_bundle_override" type="String" setter="" getter="" default="&quot;&quot;">
CA certificates bundle to use for SSL connections. If not defined, Godot's internal CA certificates are used. The CA certificates bundle to use for SSL connections. If this is set to a non-empty value, this will [i]override[/i] Godot's default [url=https://github.com/godotengine/godot/blob/master/thirdparty/certs/ca-certificates.crt]Mozilla certificate bundle[/url]. If left empty, the default certificate bundle will be used.
If in doubt, leave this setting empty.
</member> </member>
<member name="node/name_casing" type="int" setter="" getter="" default="0"> <member name="node/name_casing" type="int" setter="" getter="" default="0">
When creating node names automatically, set the type of casing in this project. This is mostly an editor setting. When creating node names automatically, set the type of casing in this project. This is mostly an editor setting.
......
...@@ -2011,7 +2011,7 @@ bool Main::start() { ...@@ -2011,7 +2011,7 @@ bool Main::start() {
if (!project_manager && !editor) { // game if (!project_manager && !editor) { // game
// Load SSL Certificates from Project Settings (or builtin). // Load SSL Certificates from Project Settings (or builtin).
Crypto::load_default_certificates(GLOBAL_DEF("network/ssl/certificates", "")); Crypto::load_default_certificates(GLOBAL_DEF("network/ssl/certificate_bundle_override", ""));
if (game_path != "") { if (game_path != "") {
Node *scene = nullptr; Node *scene = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment