https://github.com/python/cpython/commit/eec8c98d06a9ba4f4c811a07dd358e92f3b928ca
commit: eec8c98d06a9ba4f4c811a07dd358e92f3b928ca
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2025-09-12T15:39:16+02:00
summary:
gh-129813, PEP 782: Use PyBytesWriter in _hashopenssl (#138835)
Replace PyBytes_FromStringAndSize(NULL, size) with the new public
PyBytesWriter API.
files:
M Modules/_hashopenssl.c
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 442804353756c7..628e6dc11668e0 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -1101,20 +1101,19 @@ _hashlib_HASHXOF_digest_impl(HASHobject *self,
Py_ssize_t length)
/*[clinic end generated code: output=dcb09335dd2fe908 input=224d047da2c12a42]*/
{
EVP_MD_CTX *temp_ctx;
- PyObject *retval;
if (length == 0) {
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}
- retval = PyBytes_FromStringAndSize(NULL, length);
- if (retval == NULL) {
+ PyBytesWriter *writer = PyBytesWriter_Create(length);
+ if (writer == NULL) {
return NULL;
}
temp_ctx = py_wrapper_EVP_MD_CTX_new();
if (temp_ctx == NULL) {
- Py_DECREF(retval);
+ PyBytesWriter_Discard(writer);
return NULL;
}
@@ -1122,7 +1121,7 @@ _hashlib_HASHXOF_digest_impl(HASHobject *self, Py_ssize_t
length)
goto error;
}
if (!EVP_DigestFinalXOF(temp_ctx,
- (unsigned char*)PyBytes_AS_STRING(retval),
+ (unsigned char*)PyBytesWriter_GetData(writer),
length))
{
notify_ssl_error_occurred_in(Py_STRINGIFY(EVP_DigestFinalXOF));
@@ -1130,10 +1129,10 @@ _hashlib_HASHXOF_digest_impl(HASHobject *self,
Py_ssize_t length)
}
EVP_MD_CTX_free(temp_ctx);
- return retval;
+ return PyBytesWriter_Finish(writer);
error:
- Py_DECREF(retval);
+ PyBytesWriter_Discard(writer);
EVP_MD_CTX_free(temp_ctx);
return NULL;
}
@@ -1750,7 +1749,6 @@ _hashlib_scrypt_impl(PyObject *module, Py_buffer
*password, Py_buffer *salt,
long maxmem, long dklen)
/*[clinic end generated code: output=d424bc3e8c6b9654 input=bdeac9628d07f7a1]*/
{
- PyObject *key = NULL;
int retval;
if (password->len > INT_MAX) {
@@ -1791,8 +1789,8 @@ _hashlib_scrypt_impl(PyObject *module, Py_buffer
*password, Py_buffer *salt,
return NULL;
}
- key = PyBytes_FromStringAndSize(NULL, dklen);
- if (key == NULL) {
+ PyBytesWriter *writer = PyBytesWriter_Create(dklen);
+ if (writer == NULL) {
return NULL;
}
@@ -1801,16 +1799,16 @@ _hashlib_scrypt_impl(PyObject *module, Py_buffer
*password, Py_buffer *salt,
(const char *)password->buf, (size_t)password->len,
(const unsigned char *)salt->buf, (size_t)salt->len,
(uint64_t)n, (uint64_t)r, (uint64_t)p, (uint64_t)maxmem,
- (unsigned char *)PyBytes_AS_STRING(key), (size_t)dklen
+ PyBytesWriter_GetData(writer), (size_t)dklen
);
Py_END_ALLOW_THREADS
if (!retval) {
- Py_DECREF(key);
+ PyBytesWriter_Discard(writer);
notify_ssl_error_occurred_in(Py_STRINGIFY(EVP_PBE_scrypt));
return NULL;
}
- return key;
+ return PyBytesWriter_Finish(writer);
}
#undef HASHLIB_SCRYPT_MAX_DKLEN
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
