-
-
Notifications
You must be signed in to change notification settings - Fork 35.3k
gh-156228: Use PyMem_Raw* allocators for OpenSSL in _ssl and _hashlib #156229
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.
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
Open
kumaraditya303
wants to merge
1
commit into
python:main
Choose a base branch
from
kumaraditya303:openssl-raw-allocators
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
4 changes: 4 additions & 0 deletions
4
Misc/NEWS.d/next/Library/2026-08-22-10-30-00.gh-issue-156228.k3Rmxw.rst
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| The :mod:`ssl` and :mod:`hashlib` modules now route OpenSSL memory | ||
| allocations through the Python raw memory allocators, making OpenSSL memory | ||
| usage visible to :mod:`tracemalloc` and to custom allocators installed with | ||
| :c:func:`PyMem_SetAllocator`. |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Route OpenSSL allocations through the raw memory allocators. | ||
| // Shared by the _ssl and _hashlib modules. | ||
|
|
||
| #ifndef Py_OPENSSL_MEM_H | ||
| #define Py_OPENSSL_MEM_H | ||
|
|
||
| #include "Python.h" | ||
|
|
||
| #include <openssl/crypto.h> // CRYPTO_set_mem_functions() | ||
|
|
||
| // LibreSSL stubs out CRYPTO_set_mem_functions() and BoringSSL lacks it. | ||
| // AWS-LC has it, but unlike OpenSSL it does not refuse to install hooks | ||
| // after the first allocation, so earlier size-prefixed allocations would | ||
| // be freed with the wrong allocator. | ||
| #if !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_IS_BORINGSSL) \ | ||
| && !defined(OPENSSL_IS_AWSLC) | ||
| # define _Py_OPENSSL_CAN_SET_MEM_FUNCTIONS | ||
| #endif | ||
|
|
||
| #ifdef _Py_OPENSSL_CAN_SET_MEM_FUNCTIONS | ||
|
|
||
| static void * | ||
| _PyOpenSSL_Malloc(size_t size, const char *Py_UNUSED(file), | ||
| int Py_UNUSED(line)) | ||
| { | ||
| return PyMem_RawMalloc(size); | ||
| } | ||
|
|
||
| static void * | ||
| _PyOpenSSL_Realloc(void *ptr, size_t size, const char *Py_UNUSED(file), | ||
| int Py_UNUSED(line)) | ||
| { | ||
| return PyMem_RawRealloc(ptr, size); | ||
| } | ||
|
|
||
| static void | ||
| _PyOpenSSL_Free(void *ptr, const char *Py_UNUSED(file), | ||
| int Py_UNUSED(line)) | ||
| { | ||
| PyMem_RawFree(ptr); | ||
| } | ||
|
|
||
| #endif // _Py_OPENSSL_CAN_SET_MEM_FUNCTIONS | ||
|
|
||
| static void | ||
| _PyOpenSSL_SetupMemFunctions(void) | ||
| { | ||
| #ifdef _Py_OPENSSL_CAN_SET_MEM_FUNCTIONS | ||
| // Fails if OpenSSL has already allocated memory (e.g. another | ||
| // libcrypto user in the process); it then keeps its current allocator. | ||
| (void)CRYPTO_set_mem_functions(_PyOpenSSL_Malloc, _PyOpenSSL_Realloc, | ||
| _PyOpenSSL_Free); | ||
| #endif | ||
| } | ||
|
|
||
| #endif // !Py_OPENSSL_MEM_H | ||
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
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
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.