diff options
| author | Gregory P. Smith <greg@krypto.org> | 2023-02-16 06:08:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 06:08:20 (GMT) |
| commit | 0b13575e74ff3321364a3389eda6b4e92792afe1 (patch) | |
| tree | 1fc6775cb290958f1c4d0e98c17300629f8aa9c4 /PCbuild | |
| parent | 89ac665891dec1988bedec2ce9b2c4d016502a49 (diff) | |
| download | cpython-0b13575e74ff3321364a3389eda6b4e92792afe1.zip cpython-0b13575e74ff3321364a3389eda6b4e92792afe1.tar.gz cpython-0b13575e74ff3321364a3389eda6b4e92792afe1.tar.bz2 | |
gh-99108: Refactor _sha256 & _sha512 into _sha2. (#101924)
This merges their code. They're backed by the same single HACL* static library, having them be a single module simplifies maintenance.
This should unbreak the wasm enscripten builds that currently fail due to linking in --whole-archive mode and the HACL* library appearing twice.
Long unnoticed error fixed: _sha512.SHA384Type was doubly assigned and was actually SHA512Type. Nobody depends on those internal names.
Also rename LIBHACL_ make vars to LIBHACL_SHA2_ in preperation for other future HACL things.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 3 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index e8e9ff0..222963b 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -408,8 +408,7 @@ <ClCompile Include="..\Modules\rotatingtree.c" /> <ClCompile Include="..\Modules\sha1module.c" /> <ClCompile Include="..\Modules\_hacl\Hacl_Streaming_SHA2.c" /> - <ClCompile Include="..\Modules\sha256module.c" /> - <ClCompile Include="..\Modules\sha512module.c" /> + <ClCompile Include="..\Modules\sha2module.c" /> <ClCompile Include="..\Modules\signalmodule.c" /> <ClCompile Include="..\Modules\_statisticsmodule.c" /> <ClCompile Include="..\Modules\symtablemodule.c" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 4820db6..efb9622 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -869,10 +869,7 @@ <ClCompile Include="..\Modules\_hacl\Hacl_Streaming_SHA2.c"> <Filter>Modules</Filter> </ClCompile> - <ClCompile Include="..\Modules\sha256module.c"> - <Filter>Modules</Filter> - </ClCompile> - <ClCompile Include="..\Modules\sha512module.c"> + <ClCompile Include="..\Modules\sha2module.c"> <Filter>Modules</Filter> </ClCompile> <ClCompile Include="..\Modules\signalmodule.c"> |