Repository navigation
[3.15] gh-159786: Convert HACL* update() errors in _hmac after releasing the lock (GH-159805) - #159825
Open
miss-islington wants to merge 1 commit into
Open
[3.15] gh-159786: Convert HACL* update() errors in _hmac after releasing the lock (GH-159805)#159825miss-islington wants to merge 1 commit into
_hmac after releasing the lock (GH-159805)#159825miss-islington wants to merge 1 commit into
Conversation
…sing the lock (pythonGH-159805) * pythongh-159786: Convert HACL* update() errors in `_hmac` after releasing the lock `_hacl_hmac_state_update_once()` converted the HACL* exit code into an exception while the thread state was detached and, for HMAC.update(), while the object's mutex was held. On debug builds, this re-attached the thread state under the mutex and then called PyErr_Occurred() with the thread state detached in the chunking loop of `_hacl_hmac_state_update()`. Return the raw HACL* exit code instead and convert it in `_hmac.new()` and `_hmac.HMAC.update()` once the thread state is re-attached and the mutex is released, as `hmac_digest_compute_locked()` already does. Release builds keep ignoring the update() exit code. Since `_hacl_convert_errno()` is now always called with an attached thread state, remove the `PyGILState_Ensure()` added by pythongh-135561 and assert that a thread state is attached instead. * simplify ifdefs: always check for the hacl error --------- (cherry picked from commit 0fba211) Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Gregory P. Smith <greg@krypto.org>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
update()errors are handled without a thread state #159786: Convert HACL* update() errors in_hmacafter releasing the lock_hacl_hmac_state_update_once()converted the HACL* exit code into anexception while the thread state was detached and, for HMAC.update(),
while the object's mutex was held. On debug builds, this re-attached the
thread state under the mutex and then called PyErr_Occurred() with the
thread state detached in the chunking loop of
_hacl_hmac_state_update().Return the raw HACL* exit code instead and convert it in
_hmac.new()and_hmac.HMAC.update()once the thread state is re-attached and the mutexis released, as
hmac_digest_compute_locked()already does. Releasebuilds keep ignoring the update() exit code.
Since
_hacl_convert_errno()is now always called with an attachedthread state, remove the
PyGILState_Ensure()added by gh-135561 andassert that a thread state is attached instead.
(cherry picked from commit 0fba211)
Co-authored-by: Bénédikt Tran 10796600+picnixz@users.noreply.github.com
Co-authored-by: Gregory P. Smith greg@krypto.org