godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #61402 from akien-mga/html5-enable-mbedtls

Browse Source
This commit is contained in:
Rémi Verschelde
2022-05-25 14:51:02 +02:00
committed by GitHub
parent 971daadfa0 3ff6d794c0
commit 5f8888c445
8 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/Crypto.xml
View File

@@ -68,7 +68,6 @@
} }
[/csharp] [/csharp]
[/codeblocks] [/codeblocks]
[b]Note:[/b] Not available in HTML5 exports.
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>

1
doc/classes/CryptoKey.xml
View File

@@ -6,7 +6,6 @@
<description> <description>
The CryptoKey class represents a cryptographic key. Keys can be loaded and saved like any other [Resource]. The CryptoKey class represents a cryptographic key. Keys can be loaded and saved like any other [Resource].
They can be used to generate a self-signed [X509Certificate] via [method Crypto.generate_self_signed_certificate] and as private key in [method StreamPeerSSL.accept_stream] along with the appropriate certificate. They can be used to generate a self-signed [X509Certificate] via [method Crypto.generate_self_signed_certificate] and as private key in [method StreamPeerSSL.accept_stream] along with the appropriate certificate.
[b]Note:[/b] Not available in HTML5 exports.
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>

1
doc/classes/HMACContext.xml
View File

@@ -50,7 +50,6 @@
[/csharp] [/csharp]
[/codeblocks] [/codeblocks]
[b]Note:[/b] Not available in HTML5 exports.
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>

1
doc/classes/HashingContext.xml
View File

@@ -57,7 +57,6 @@
} }
[/csharp] [/csharp]
[/codeblocks] [/codeblocks]
[b]Note:[/b] Not available in HTML5 exports.
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>

1
doc/classes/X509Certificate.xml
View File

@@ -6,7 +6,6 @@
<description> <description>
The X509Certificate class represents an X509 certificate. Certificates can be loaded and saved like any other [Resource]. The X509Certificate class represents an X509 certificate. Certificates can be loaded and saved like any other [Resource].
They can be used as the server certificate in [method StreamPeerSSL.accept_stream] (along with the proper [CryptoKey]), and to specify the only certificate that should be accepted when connecting to an SSL server via [method StreamPeerSSL.connect_to_stream]. They can be used as the server certificate in [method StreamPeerSSL.accept_stream] (along with the proper [CryptoKey]), and to specify the only certificate that should be accepted when connecting to an SSL server via [method StreamPeerSSL.connect_to_stream].
[b]Note:[/b] Not available in HTML5 exports.
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>

4
editor/editor_node.cpp
View File

@@ -7025,11 +7025,15 @@ EditorNode::EditorNode() {
ScriptTextEditor::register_editor(); // Register one for text scripts. ScriptTextEditor::register_editor(); // Register one for text scripts.
TextEditor::register_editor(); TextEditor::register_editor();
// Asset Library can't work on Web editor for now as most assets are sourced
// directly from GitHub which does not set CORS.
#ifndef JAVASCRIPT_ENABLED
if (StreamPeerSSL::is_available()) { if (StreamPeerSSL::is_available()) {
add_editor_plugin(memnew(AssetLibraryEditorPlugin)); add_editor_plugin(memnew(AssetLibraryEditorPlugin));
} else { } else {
WARN_PRINT("Asset Library not available, as it requires SSL to work."); WARN_PRINT("Asset Library not available, as it requires SSL to work.");
} }
#endif
// Add interface before adding plugins. // Add interface before adding plugins.

4
editor/project_manager.cpp
View File

@@ -2773,6 +2773,9 @@ ProjectManager::ProjectManager() {
center_box->add_child(settings_hb); center_box->add_child(settings_hb);
} }
// Asset Library can't work on Web editor for now as most assets are sourced
// directly from GitHub which does not set CORS.
#ifndef JAVASCRIPT_ENABLED
if (StreamPeerSSL::is_available()) { if (StreamPeerSSL::is_available()) {
asset_library = memnew(EditorAssetLibrary(true)); asset_library = memnew(EditorAssetLibrary(true));
asset_library->set_name(TTR("Asset Library Projects")); asset_library->set_name(TTR("Asset Library Projects"));
@@ -2781,6 +2784,7 @@ ProjectManager::ProjectManager() {
} else { } else {
WARN_PRINT("Asset Library not available, as it requires SSL to work."); WARN_PRINT("Asset Library not available, as it requires SSL to work.");
} }
#endif
{ {
// Dialogs // Dialogs

5
platform/javascript/detect.py
View File

@@ -48,11 +48,6 @@ def get_flags():
return [ return [
("tools", False), ("tools", False),
("builtin_pcre2_with_jit", False), ("builtin_pcre2_with_jit", False),
# Disabling the mbedtls module reduces file size.
# The module has little use due to the limited networking functionality
# in this platform. For the available networking methods, the browser
# manages TLS.
("module_mbedtls_enabled", False),
("vulkan", False), ("vulkan", False),
] ]