aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-01-01 13:52:23 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-01-01 13:52:23 -0800
commit5f4c492c8e9124ac51c27b4e323426003cca47e3 (patch)
tree1b3b4843e3bb2fb6b0c48961f0e294eb20d8565d
parentc9add40cc5ccd5de4279ac894b47c0695258520d (diff)
parente1883f4aa282af9b778c4ac6466c12003b9668fb (diff)
downloadcryptography-5f4c492c8e9124ac51c27b4e323426003cca47e3.tar.gz
cryptography-5f4c492c8e9124ac51c27b4e323426003cca47e3.tar.bz2
cryptography-5f4c492c8e9124ac51c27b4e323426003cca47e3.zip
Merge pull request #387 from exarkun/crypto-locks
expose num_locks and {get,set}_{id,locking}_callback
-rw-r--r--cryptography/hazmat/backends/openssl/crypto.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/crypto.py b/cryptography/hazmat/backends/openssl/crypto.py
index 835be14b..189867bd 100644
--- a/cryptography/hazmat/backends/openssl/crypto.py
+++ b/cryptography/hazmat/backends/openssl/crypto.py
@@ -36,6 +36,11 @@ int CRYPTO_mem_ctrl(int);
int CRYPTO_is_mem_check_on(void);
void CRYPTO_mem_leaks(struct bio_st *);
void CRYPTO_cleanup_all_ex_data(void);
+int CRYPTO_num_locks(void);
+void CRYPTO_set_locking_callback(void(*)(int, int, const char *, int));
+void CRYPTO_set_id_callback(unsigned long (*)(void));
+unsigned long (*CRYPTO_get_id_callback(void))(void);
+void (*CRYPTO_get_locking_callback(void))(int, int, const char *, int);
void OPENSSL_free(void *);
"""