Skip to content

gh-129813, PEP 782: Use PyBytesWriter in _sha3 #138923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in _sha3 #138923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6c318
gh-129813, PEP 782: Use PyBytesWriter in _sha3
vstinner Sep 15, 2025
add8ef5
Change blank lines in _sha3_shake_128_hexdigest_impl()
vstinner Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Modules/sha3module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,19 @@ _sha3_shake_128_digest_impl(SHA3object *self, Py_ssize_t length)
if (length == 0) {
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}

CHECK_HACL_UINT32_T_LENGTH(length);
PyObject *digest = PyBytes_FromStringAndSize(NULL, length);
uint8_t *buffer = (uint8_t *)PyBytes_AS_STRING(digest);

PyBytesWriter *writer = PyBytesWriter_Create(length);
if (writer == NULL) {
return NULL;
}
uint8_t *buffer = (uint8_t *)PyBytesWriter_GetData(writer);

HASHLIB_ACQUIRE_LOCK(self);
(void)Hacl_Hash_SHA3_squeeze(self->hash_state, buffer, (uint32_t)length);
HASHLIB_RELEASE_LOCK(self);
return digest;

return PyBytesWriter_Finish(writer);
}


Expand All @@ -540,8 +545,8 @@ _sha3_shake_128_hexdigest_impl(SHA3object *self, Py_ssize_t length)
if (length == 0) {
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}

CHECK_HACL_UINT32_T_LENGTH(length);

uint8_t *buffer = PyMem_Malloc(length);
if (buffer == NULL) {
return PyErr_NoMemory();
Expand All @@ -550,6 +555,7 @@ _sha3_shake_128_hexdigest_impl(SHA3object *self, Py_ssize_t length)
HASHLIB_ACQUIRE_LOCK(self);
(void)Hacl_Hash_SHA3_squeeze(self->hash_state, buffer, (uint32_t)length);
HASHLIB_RELEASE_LOCK(self);

PyObject *digest = _Py_strhex((const char *)buffer, length);
PyMem_Free(buffer);
return digest;
Expand Down
Loading