mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

gh-129813, PEP 782: Use PyBytesWriter in _hashopenssl (#138922)

Browse source 
Replace PyBytes_FromStringAndSize(NULL, size) with the new public
PyBytesWriter API.
This commit is contained in:
Victor Stinner 2025-09-15 17:41:43 +01:00 • committed by GitHub
parent 29d026f93e
commit a68efdf09c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/_hashopenssl.c
View file

@ -1629,7 +1629,6 @@ pbkdf2_hmac_impl(PyObject *module, const char *hash_name,
{ {
_hashlibstate *state = get_hashlib_state(module); _hashlibstate *state = get_hashlib_state(module);
PyObject *key_obj = NULL; PyObject *key_obj = NULL;
char *key;
long dklen; long dklen;
int retval; int retval;
@ -1682,24 +1681,24 @@ pbkdf2_hmac_impl(PyObject *module, const char *hash_name,
goto end; goto end;
} }
key_obj = PyBytes_FromStringAndSize(NULL, dklen); PyBytesWriter *writer = PyBytesWriter_Create(dklen);
if (key_obj == NULL) { if (writer == NULL) {
goto end; goto end;
} }
key = PyBytes_AS_STRING(key_obj);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
retval = PKCS5_PBKDF2_HMAC((const char *)password->buf, (int)password->len, retval = PKCS5_PBKDF2_HMAC((const char *)password->buf, (int)password->len,
(const unsigned char *)salt->buf, (int)salt->len, (const unsigned char *)salt->buf, (int)salt->len,
iterations, digest, dklen, iterations, digest, dklen,
(unsigned char *)key); (unsigned char *)PyBytesWriter_GetData(writer));
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (!retval) { if (!retval) {
Py_CLEAR(key_obj); PyBytesWriter_Discard(writer);
notify_ssl_error_occurred_in(Py_STRINGIFY(PKCS5_PBKDF2_HMAC)); notify_ssl_error_occurred_in(Py_STRINGIFY(PKCS5_PBKDF2_HMAC));
goto end; goto end;
} }
key_obj = PyBytesWriter_Finish(writer);
end: end:
if (digest != NULL) { if (digest != NULL) {
@ -1799,7 +1798,7 @@ _hashlib_scrypt_impl(PyObject *module, Py_buffer *password, Py_buffer *salt,
(const char *)password->buf, (size_t)password->len, (const char *)password->buf, (size_t)password->len,
(const unsigned char *)salt->buf, (size_t)salt->len, (const unsigned char *)salt->buf, (size_t)salt->len,
(uint64_t)n, (uint64_t)r, (uint64_t)p, (uint64_t)maxmem, (uint64_t)n, (uint64_t)r, (uint64_t)p, (uint64_t)maxmem,
PyBytesWriter_GetData(writer), (size_t)dklen (unsigned char *)PyBytesWriter_GetData(writer), (size_t)dklen
); );
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS