-
-
Notifications
You must be signed in to change notification settings - Fork 30.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
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.
- Loading branch information
Showing
18 changed files
with
1,310 additions
and
1,493 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| # Test hashlib module | ||
| # | ||
| # $Id$ | ||
| # Test the hashlib module. | ||
| # | ||
| # Copyright (C) 2005-2010 Gregory P. Smith ([email protected]) | ||
| # Licensed to PSF under a Contributor Agreement. | ||
|
|
@@ -28,7 +26,6 @@ | |
| from http.client import HTTPException | ||
|
|
||
|
|
||
| # default builtin hash module | ||
| default_builtin_hashes = {'md5', 'sha1', 'sha256', 'sha512', 'sha3', 'blake2'} | ||
| # --with-builtin-hashlib-hashes override | ||
| builtin_hashes = sysconfig.get_config_var("PY_BUILTIN_HASHLIB_HASHES") | ||
|
|
@@ -66,6 +63,7 @@ def get_fips_mode(): | |
| requires_blake2 = unittest.skipUnless(_blake2, 'requires _blake2') | ||
|
|
||
| # bpo-46913: Don't test the _sha3 extension on a Python UBSAN build | ||
| # TODO(gh-99108): Revisit this after _sha3 uses HACL*. | ||
| SKIP_SHA3 = support.check_sanitizer(ub=True) | ||
| requires_sha3 = unittest.skipUnless(not SKIP_SHA3, 'requires _sha3') | ||
|
|
||
|
|
@@ -107,7 +105,7 @@ class HashLibTestCase(unittest.TestCase): | |
|
|
||
| shakes = {'shake_128', 'shake_256'} | ||
|
|
||
| # Issue #14693: fallback modules are always compiled under POSIX | ||
| # gh-58898: Fallback modules are always compiled under POSIX. | ||
| _warn_on_extension_import = (os.name == 'posix' or support.Py_DEBUG) | ||
|
|
||
| def _conditional_import_module(self, module_name): | ||
|
|
@@ -116,7 +114,7 @@ def _conditional_import_module(self, module_name): | |
| return importlib.import_module(module_name) | ||
| except ModuleNotFoundError as error: | ||
| if self._warn_on_extension_import and module_name in builtin_hashes: | ||
| warnings.warn('Did a C extension fail to compile? %s' % error) | ||
| warnings.warn(f'Did a C extension fail to compile? {error}') | ||
| return None | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
|
|
@@ -147,7 +145,7 @@ def _test_algorithm_via_hashlib_new(data=None, _alg=algorithm, **kwargs): | |
| _hashlib = self._conditional_import_module('_hashlib') | ||
| self._hashlib = _hashlib | ||
| if _hashlib: | ||
| # These two algorithms should always be present when this module | ||
| # These algorithms should always be present when this module | ||
| # is compiled. If not, something was compiled wrong. | ||
| self.assertTrue(hasattr(_hashlib, 'openssl_md5')) | ||
| self.assertTrue(hasattr(_hashlib, 'openssl_sha1')) | ||
|
|
@@ -172,12 +170,10 @@ def add_builtin_constructor(name): | |
| _sha1 = self._conditional_import_module('_sha1') | ||
| if _sha1: | ||
| add_builtin_constructor('sha1') | ||
| _sha256 = self._conditional_import_module('_sha256') | ||
| if _sha256: | ||
| _sha2 = self._conditional_import_module('_sha2') | ||
| if _sha2: | ||
| add_builtin_constructor('sha224') | ||
| add_builtin_constructor('sha256') | ||
| _sha512 = self._conditional_import_module('_sha512') | ||
| if _sha512: | ||
| add_builtin_constructor('sha384') | ||
| add_builtin_constructor('sha512') | ||
| if _blake2: | ||
|
|
@@ -460,9 +456,9 @@ def check_blocksize_name(self, name, block_size=0, digest_size=0, | |
| self.assertEqual(len(m.hexdigest()), 2*digest_size) | ||
| self.assertEqual(m.name, name) | ||
| # split for sha3_512 / _sha3.sha3 object | ||
| self.assertIn(name.split("_")[0], repr(m)) | ||
| self.assertIn(name.split("_")[0], repr(m).lower()) | ||
|
|
||
| def test_blocksize_name(self): | ||
| def test_blocksize_and_name(self): | ||
| self.check_blocksize_name('md5', 64, 16) | ||
| self.check_blocksize_name('sha1', 64, 20) | ||
| self.check_blocksize_name('sha224', 64, 28) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Library/2023-02-15-01-54-06.gh-issue-99108.rjTSic.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| The built-in extension modules for :mod:`hashlib` SHA2 algorithms, used when | ||
| OpenSSL does not provide them, now live in a single internal ``_sha2`` module | ||
| instead of separate ``_sha256`` and ``_sha512`` modules. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.