summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-09-08 09:20:19 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-09-08 09:20:19 +0200
commita51dc70dfb7ca57f7ce7f0d764c12044405158b2 (patch)
tree9d272067bb78a68fb81cf8c91a62177d6e9eb68a /main
parentcdb121dffaa0486da8894b7e8d0a2f595f382be4 (diff)
parenta95d7924204c26b5ff64a82c24579a8cdf58dac2 (diff)
Merge pull request #65460 from Faless/net/4.x_ssl_to_tls_more
[Net] Rename "ssl" references to "tls" in methods and members.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 0ce3ef20be..a338b71154 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2799,7 +2799,7 @@ bool Main::start() {
Engine::get_singleton()->startup_benchmark_begin_measure("game_load");
// Load SSL Certificates from Project Settings (or builtin).
- Crypto::load_default_certificates(GLOBAL_DEF("network/ssl/certificate_bundle_override", ""));
+ Crypto::load_default_certificates(GLOBAL_DEF("network/tls/certificate_bundle_override", ""));
if (!game_path.is_empty()) {
Node *scene = nullptr;
@@ -2856,7 +2856,7 @@ bool Main::start() {
if (project_manager || editor) {
// Load SSL Certificates from Editor Settings (or builtin)
Crypto::load_default_certificates(
- EditorSettings::get_singleton()->get_setting("network/ssl/editor_ssl_certificates").operator String());
+ EditorSettings::get_singleton()->get_setting("network/tls/editor_tls_certificates").operator String());
}
#endif
}