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 /Modules/Setup | |
| 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 'Modules/Setup')
| -rw-r--r-- | Modules/Setup | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/Setup b/Modules/Setup index 428be0a..1d5183b 100644 --- a/Modules/Setup +++ b/Modules/Setup @@ -165,8 +165,7 @@ PYTHONPATH=$(COREPYTHONPATH) #_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c #_md5 md5module.c #_sha1 sha1module.c -#_sha256 sha256module.c -#_sha512 sha512module.c +#_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a #_sha3 _sha3/sha3module.c # text encodings and unicode |