noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #65460 from Faless/net/4.x_ssl_to_tls_more

Browse Source 
[Net] Rename "ssl" references to "tls" in methods and members.
This commit is contained in:
Rémi Verschelde
2022-09-08 09:20:19 +02:00
parent cdb121dffa a95d792420
commit a51dc70dfb
46 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@@ -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
}