diff options
| author | skallweitNV <64953474+skallweitNV@users.noreply.github.com> | 2022-12-02 16:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 16:34:53 +0100 |
| commit | e9b7c66a541636e72659fbfcc9a3f20a85f2bee8 (patch) | |
| tree | b65942799ff6267ebe29c8b64056819461621be7 /build | |
| parent | 92ae4949fe1af28ef31331fd4116c8111c057420 (diff) | |
Cleanup crypto utilities (#2549)
* Consolidate crypto functions into single module
* Migrate rest of code to new crypto module
* Fix name conflict
Diffstat (limited to 'build')
6 files changed, 16 insertions, 48 deletions
diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj index 47ca16cd5..e171a7d68 100644 --- a/build/visual-studio/core/core.vcxproj +++ b/build/visual-studio/core/core.vcxproj @@ -276,11 +276,10 @@ <ClInclude Include="..\..\..\source\core\slang-command-line.h" /> <ClInclude Include="..\..\..\source\core\slang-common.h" /> <ClInclude Include="..\..\..\source\core\slang-compression-system.h" /> + <ClInclude Include="..\..\..\source\core\slang-crypto.h" /> <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" /> <ClInclude Include="..\..\..\source\core\slang-destroyable.h" /> <ClInclude Include="..\..\..\source\core\slang-dictionary.h" /> - <ClInclude Include="..\..\..\source\core\slang-digest-builder.h" /> - <ClInclude Include="..\..\..\source\core\slang-digest-util.h" /> <ClInclude Include="..\..\..\source\core\slang-exception.h" /> <ClInclude Include="..\..\..\source\core\slang-file-system.h" /> <ClInclude Include="..\..\..\source\core\slang-free-list.h" /> @@ -295,7 +294,6 @@ <ClInclude Include="..\..\..\source\core\slang-list.h" /> <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" /> <ClInclude Include="..\..\..\source\core\slang-math.h" /> - <ClInclude Include="..\..\..\source\core\slang-md5.h" /> <ClInclude Include="..\..\..\source\core\slang-memory-arena.h" /> <ClInclude Include="..\..\..\source\core\slang-memory-file-system.h" /> <ClInclude Include="..\..\..\source\core\slang-offset-container.h" /> @@ -342,8 +340,8 @@ <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp" /> <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" /> <ClCompile Include="..\..\..\source\core\slang-command-line.cpp" /> + <ClCompile Include="..\..\..\source\core\slang-crypto.cpp" /> <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp" /> - <ClCompile Include="..\..\..\source\core\slang-digest-util.cpp" /> <ClCompile Include="..\..\..\source\core\slang-file-system.cpp" /> <ClCompile Include="..\..\..\source\core\slang-free-list.cpp" /> <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp" /> @@ -352,7 +350,6 @@ <ClCompile Include="..\..\..\source\core\slang-io.cpp" /> <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp" /> <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" /> - <ClCompile Include="..\..\..\source\core\slang-md5.cpp" /> <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" /> <ClCompile Include="..\..\..\source\core\slang-memory-file-system.cpp" /> <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp" /> diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters index 068023108..06d151349 100644 --- a/build/visual-studio/core/core.vcxproj.filters +++ b/build/visual-studio/core/core.vcxproj.filters @@ -60,6 +60,9 @@ <ClInclude Include="..\..\..\source\core\slang-compression-system.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\core\slang-crypto.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h"> <Filter>Header Files</Filter> </ClInclude> @@ -69,12 +72,6 @@ <ClInclude Include="..\..\..\source\core\slang-dictionary.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-digest-builder.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-digest-util.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\core\slang-exception.h"> <Filter>Header Files</Filter> </ClInclude> @@ -117,9 +114,6 @@ <ClInclude Include="..\..\..\source\core\slang-math.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-md5.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\core\slang-memory-arena.h"> <Filter>Header Files</Filter> </ClInclude> @@ -254,10 +248,10 @@ <ClCompile Include="..\..\..\source\core\slang-command-line.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp"> + <ClCompile Include="..\..\..\source\core\slang-crypto.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-digest-util.cpp"> + <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\source\core\slang-file-system.cpp"> @@ -284,9 +278,6 @@ <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-md5.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp"> <Filter>Source Files</Filter> </ClCompile> diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj index 13afadf6a..03d3852fd 100644 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj @@ -288,11 +288,10 @@ <ClInclude Include="..\..\..\source\core\slang-command-line.h" /> <ClInclude Include="..\..\..\source\core\slang-common.h" /> <ClInclude Include="..\..\..\source\core\slang-compression-system.h" /> + <ClInclude Include="..\..\..\source\core\slang-crypto.h" /> <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" /> <ClInclude Include="..\..\..\source\core\slang-destroyable.h" /> <ClInclude Include="..\..\..\source\core\slang-dictionary.h" /> - <ClInclude Include="..\..\..\source\core\slang-digest-builder.h" /> - <ClInclude Include="..\..\..\source\core\slang-digest-util.h" /> <ClInclude Include="..\..\..\source\core\slang-exception.h" /> <ClInclude Include="..\..\..\source\core\slang-file-system.h" /> <ClInclude Include="..\..\..\source\core\slang-free-list.h" /> @@ -307,7 +306,6 @@ <ClInclude Include="..\..\..\source\core\slang-list.h" /> <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" /> <ClInclude Include="..\..\..\source\core\slang-math.h" /> - <ClInclude Include="..\..\..\source\core\slang-md5.h" /> <ClInclude Include="..\..\..\source\core\slang-memory-arena.h" /> <ClInclude Include="..\..\..\source\core\slang-memory-file-system.h" /> <ClInclude Include="..\..\..\source\core\slang-offset-container.h" /> @@ -355,8 +353,8 @@ <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp" /> <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" /> <ClCompile Include="..\..\..\source\core\slang-command-line.cpp" /> + <ClCompile Include="..\..\..\source\core\slang-crypto.cpp" /> <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp" /> - <ClCompile Include="..\..\..\source\core\slang-digest-util.cpp" /> <ClCompile Include="..\..\..\source\core\slang-file-system.cpp" /> <ClCompile Include="..\..\..\source\core\slang-free-list.cpp" /> <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp" /> @@ -365,7 +363,6 @@ <ClCompile Include="..\..\..\source\core\slang-io.cpp" /> <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp" /> <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" /> - <ClCompile Include="..\..\..\source\core\slang-md5.cpp" /> <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" /> <ClCompile Include="..\..\..\source\core\slang-memory-file-system.cpp" /> <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp" /> diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters index dd72f5178..df9f8c2ca 100644 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters @@ -60,6 +60,9 @@ <ClInclude Include="..\..\..\source\core\slang-compression-system.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\core\slang-crypto.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h"> <Filter>Header Files</Filter> </ClInclude> @@ -69,12 +72,6 @@ <ClInclude Include="..\..\..\source\core\slang-dictionary.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-digest-builder.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-digest-util.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\core\slang-exception.h"> <Filter>Header Files</Filter> </ClInclude> @@ -117,9 +114,6 @@ <ClInclude Include="..\..\..\source\core\slang-math.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\core\slang-md5.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\core\slang-memory-arena.h"> <Filter>Header Files</Filter> </ClInclude> @@ -257,10 +251,10 @@ <ClCompile Include="..\..\..\source\core\slang-command-line.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp"> + <ClCompile Include="..\..\..\source\core\slang-crypto.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-digest-util.cpp"> + <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\source\core\slang-file-system.cpp"> @@ -287,9 +281,6 @@ <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\core\slang-md5.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp"> <Filter>Source Files</Filter> </ClCompile> diff --git a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj index 539187f3e..deab210ee 100644 --- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj +++ b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj @@ -285,8 +285,7 @@ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-com-host-callable.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-command-line-args.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-compression.cpp" />
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-digest-builder.cpp" />
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-digest-utils.cpp" />
+ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-crypto.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-file-system.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-find-type-by-name.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-free-list.cpp" />
@@ -294,7 +293,6 @@ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-json-native.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-json.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-lock-file.cpp" />
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-md5.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-memory-arena.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-offset-container.cpp" />
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-path.cpp" />
diff --git a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters index 93d7e7325..a33dc44cc 100644 --- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters +++ b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters @@ -29,10 +29,7 @@ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-compression.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-digest-builder.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-digest-utils.cpp">
+ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-crypto.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-file-system.cpp">
@@ -56,9 +53,6 @@ <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-lock-file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-md5.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\tools\slang-unit-test\unit-test-memory-arena.cpp">
<Filter>Source Files</Filter>
</ClCompile>
|