Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
c19871af
Commit
c19871af
authored
Jul 11, 2019
by
Fabio Alessandrelli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move CryptoCore to it's own folder.
Crypto classes will be placed in core/crypto.
parent
5cb41fae
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
11 additions
and
41 deletions
+11
-41
SCsub
core/SCsub
+1
-0
core_bind.cpp
core/bind/core_bind.cpp
+1
-1
crypto_core.cpp
core/crypto/crypto_core.cpp
+0
-0
crypto_core.h
core/crypto/crypto_core.h
+0
-0
file_access_encrypted.cpp
core/io/file_access_encrypted.cpp
+1
-1
SCsub
core/math/SCsub
+1
-32
file_access.cpp
core/os/file_access.cpp
+1
-1
ustring.cpp
core/ustring.cpp
+1
-1
variant_call.cpp
core/variant_call.cpp
+1
-1
editor_export.cpp
editor/editor_export.cpp
+1
-1
editor_scene_importer_gltf.cpp
editor/import/editor_scene_importer_gltf.cpp
+1
-1
wsl_peer.cpp
modules/websocket/wsl_peer.cpp
+1
-1
export.cpp
platform/uwp/export/export.cpp
+1
-1
No files found.
core/SCsub
View file @
c19871af
...
...
@@ -159,6 +159,7 @@ env.CommandNoCache('#core/license.gen.h', ["../COPYRIGHT.txt", "../LICENSE.txt"]
# Chain load SCsubs
SConscript
(
'os/SCsub'
)
SConscript
(
'math/SCsub'
)
SConscript
(
'crypto/SCsub'
)
SConscript
(
'io/SCsub'
)
SConscript
(
'bind/SCsub'
)
...
...
core/bind/core_bind.cpp
View file @
c19871af
...
...
@@ -30,11 +30,11 @@
#include "core_bind.h"
#include "core/crypto/crypto_core.h"
#include "core/io/file_access_compressed.h"
#include "core/io/file_access_encrypted.h"
#include "core/io/json.h"
#include "core/io/marshalls.h"
#include "core/math/crypto_core.h"
#include "core/math/geometry.h"
#include "core/os/keyboard.h"
#include "core/os/os.h"
...
...
core/
math
/crypto_core.cpp
→
core/
crypto
/crypto_core.cpp
View file @
c19871af
File moved
core/
math
/crypto_core.h
→
core/
crypto
/crypto_core.h
View file @
c19871af
File moved
core/io/file_access_encrypted.cpp
View file @
c19871af
...
...
@@ -30,7 +30,7 @@
#include "file_access_encrypted.h"
#include "core/
math
/crypto_core.h"
#include "core/
crypto
/crypto_core.h"
#include "core/os/copymem.h"
#include "core/print_string.h"
#include "core/variant.h"
...
...
core/math/SCsub
View file @
c19871af
...
...
@@ -2,37 +2,6 @@
Import
(
'env'
)
env_math
=
env
.
Clone
()
# Maybe make one specific for crypto?
is_builtin
=
env
[
"builtin_mbedtls"
]
has_module
=
env
[
"module_mbedtls_enabled"
]
if
is_builtin
or
not
has_module
:
# Use our headers for builtin or if the module is not going to be compiled.
# We decided not to depend on system mbedtls just for these few files that can
# be easily extracted.
env_math
.
Prepend
(
CPPPATH
=
[
"#thirdparty/mbedtls/include"
])
# MbedTLS core functions (for CryptoCore).
# If the mbedtls module is compiled we don't need to add the .c files with our
# custom config since they will be built by the module itself.
# Only if the module is not enabled, we must compile here the required sources
# to make a "light" build with only the necessary mbedtls files.
if
not
has_module
:
env_thirdparty
=
env_math
.
Clone
()
env_thirdparty
.
disable_warnings
()
# Custom config file
env_thirdparty
.
Append
(
CPPDEFINES
=
[(
'MBEDTLS_CONFIG_FILE'
,
'
\\
"thirdparty/mbedtls/include/godot_core_mbedtls_config.h
\\
"'
)])
thirdparty_mbedtls_dir
=
"#thirdparty/mbedtls/library/"
thirdparty_mbedtls_sources
=
[
"aes.c"
,
"base64.c"
,
"md5.c"
,
"sha1.c"
,
"sha256.c"
,
"godot_core_mbedtls_platform.c"
]
thirdparty_mbedtls_sources
=
[
thirdparty_mbedtls_dir
+
file
for
file
in
thirdparty_mbedtls_sources
]
env_thirdparty
.
add_source_files
(
env
.
core_sources
,
thirdparty_mbedtls_sources
)
env_math
=
env
.
Clone
()
env_math
.
add_source_files
(
env
.
core_sources
,
"*.cpp"
)
core/os/file_access.cpp
View file @
c19871af
...
...
@@ -30,9 +30,9 @@
#include "file_access.h"
#include "core/crypto/crypto_core.h"
#include "core/io/file_access_pack.h"
#include "core/io/marshalls.h"
#include "core/math/crypto_core.h"
#include "core/os/os.h"
#include "core/project_settings.h"
...
...
core/ustring.cpp
View file @
c19871af
...
...
@@ -31,7 +31,7 @@
#include "ustring.h"
#include "core/color.h"
#include "core/
math
/crypto_core.h"
#include "core/
crypto
/crypto_core.h"
#include "core/math/math_funcs.h"
#include "core/os/memory.h"
#include "core/print_string.h"
...
...
core/variant_call.cpp
View file @
c19871af
...
...
@@ -32,8 +32,8 @@
#include "core/color_names.inc"
#include "core/core_string_names.h"
#include "core/crypto/crypto_core.h"
#include "core/io/compression.h"
#include "core/math/crypto_core.h"
#include "core/object.h"
#include "core/os/os.h"
#include "core/script_language.h"
...
...
editor/editor_export.cpp
View file @
c19871af
...
...
@@ -30,11 +30,11 @@
#include "editor_export.h"
#include "core/crypto/crypto_core.h"
#include "core/io/config_file.h"
#include "core/io/resource_loader.h"
#include "core/io/resource_saver.h"
#include "core/io/zip_io.h"
#include "core/math/crypto_core.h"
#include "core/os/dir_access.h"
#include "core/os/file_access.h"
#include "core/project_settings.h"
...
...
editor/import/editor_scene_importer_gltf.cpp
View file @
c19871af
...
...
@@ -29,8 +29,8 @@
/*************************************************************************/
#include "editor_scene_importer_gltf.h"
#include "core/crypto/crypto_core.h"
#include "core/io/json.h"
#include "core/math/crypto_core.h"
#include "core/math/math_defs.h"
#include "core/os/file_access.h"
#include "core/os/os.h"
...
...
modules/websocket/wsl_peer.cpp
View file @
c19871af
...
...
@@ -35,7 +35,7 @@
#include "wsl_client.h"
#include "wsl_server.h"
#include "core/
math
/crypto_core.h"
#include "core/
crypto
/crypto_core.h"
#include "core/math/random_number_generator.h"
#include "core/os/os.h"
...
...
platform/uwp/export/export.cpp
View file @
c19871af
...
...
@@ -30,9 +30,9 @@
#include "export.h"
#include "core/bind/core_bind.h"
#include "core/crypto/crypto_core.h"
#include "core/io/marshalls.h"
#include "core/io/zip_io.h"
#include "core/math/crypto_core.h"
#include "core/object.h"
#include "core/os/dir_access.h"
#include "core/os/file_access.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment