aboutsummaryrefslogtreecommitdiffstats
path: root/src/cryptography/hazmat/bindings/openssl/_conditional.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-03-14 10:23:40 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-03-14 10:23:40 -0400
commit2e5f4ea9411f16b28b44b93959b70246d9de754e (patch)
tree647ae7be962cb4c23a11f2d1d3aabb547bcdd7a1 /src/cryptography/hazmat/bindings/openssl/_conditional.py
parent2c53403d4bd11be4f569ff73eee5bcb117a6452a (diff)
downloadcryptography-2e5f4ea9411f16b28b44b93959b70246d9de754e.tar.gz
cryptography-2e5f4ea9411f16b28b44b93959b70246d9de754e.tar.bz2
cryptography-2e5f4ea9411f16b28b44b93959b70246d9de754e.zip
Memleak tests (#3140)
* Bind a pair of mem functions. * make these conditional * do the conditional correctly * move to the right section * I'm not saying libressl should be illegal, but it is annoying * sigh, typo * first cut at memleak tests. doesn't work * hack around the previous error, onto the next one * drop the pointless restoration of the original functions * Don't try to use the previous malloc functions. The default malloc is CRYPTO_malloc which calls the custom ptr you provided, so it just recurses forever. * flake8 * Get the code basically working * flake8 * say the correct incantation * Don't try to run on old OpenSSL * Flushing this is a good idea * Fixed a py2.7+ism * GRRRRR * WOrkaround for hilarity * Revert "WOrkaround for hilarity" This reverts commit 37b9f3b4ed4063eef5add3bb5d5dd592a007d439. * Swap out these functions for the originals * py3k fix * flake8 * nonsense for windows * py3k * seperate stdout and stderr because py26 has a warning on stderr * try writing this all out for windows * useful error messages * Debugging utility * Avoid this mess, don't dlopen anything * consistency * Throw away this FFI entirely * some useful comments
Diffstat (limited to 'src/cryptography/hazmat/bindings/openssl/_conditional.py')
-rw-r--r--src/cryptography/hazmat/bindings/openssl/_conditional.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index c95a9fe0..7f488ba0 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -291,4 +291,7 @@ CONDITIONAL_NAMES = {
"Cryptography_HAS_EVP_PKEY_DHX": [
"EVP_PKEY_DHX",
],
+ "Cryptography_HAS_MEM_FUNCTIONS": [
+ "Cryptography_CRYPTO_set_mem_functions",
+ ],
}