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 /PC | |
| 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 'PC')
| -rw-r--r-- | PC/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/PC/config.c b/PC/config.c index cdb5db2..b1481d7 100644 --- a/PC/config.c +++ b/PC/config.c @@ -20,8 +20,7 @@ extern PyObject* PyInit_nt(void); extern PyObject* PyInit__operator(void); extern PyObject* PyInit__signal(void); extern PyObject* PyInit__sha1(void); -extern PyObject* PyInit__sha256(void); -extern PyObject* PyInit__sha512(void); +extern PyObject* PyInit__sha2(void); extern PyObject* PyInit__sha3(void); extern PyObject* PyInit__statistics(void); extern PyObject* PyInit__typing(void); @@ -98,8 +97,7 @@ struct _inittab _PyImport_Inittab[] = { {"_signal", PyInit__signal}, {"_md5", PyInit__md5}, {"_sha1", PyInit__sha1}, - {"_sha256", PyInit__sha256}, - {"_sha512", PyInit__sha512}, + {"_sha2", PyInit__sha2}, {"_sha3", PyInit__sha3}, {"_blake2", PyInit__blake2}, {"time", PyInit_time}, |