diff options
| author | cyli <cyli@twistedmatrix.com> | 2013-10-20 18:08:55 -0700 |
|---|---|---|
| committer | cyli <cyli@twistedmatrix.com> | 2013-12-20 13:39:44 -0800 |
| commit | e105635d5e4bff08688760b5b1692520cd439446 (patch) | |
| tree | dcca591962208ff9bc2df6fa5efe75b600663cbb | |
| parent | 76db2227819f19d1094aa569725356f0d0f02e8a (diff) | |
| download | cryptography-e105635d5e4bff08688760b5b1692520cd439446.tar.gz cryptography-e105635d5e4bff08688760b5b1692520cd439446.tar.bz2 cryptography-e105635d5e4bff08688760b5b1692520cd439446.zip | |
Move OPENSSL_free to crypto.py as per @alex
| -rw-r--r-- | cryptography/hazmat/backends/openssl/crypto.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/openssl/crypto.py b/cryptography/hazmat/backends/openssl/crypto.py index 2f1dfe11..c4300ee0 100644 --- a/cryptography/hazmat/backends/openssl/crypto.py +++ b/cryptography/hazmat/backends/openssl/crypto.py @@ -24,6 +24,8 @@ int CRYPTO_mem_ctrl(int); int CRYPTO_is_mem_check_on(); void CRYPTO_mem_leaks(struct bio_st *); void CRYPTO_cleanup_all_ex_data(); + +void OPENSSL_free(void *); """ MACROS = """ diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 5a235f85..46463eaa 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -129,7 +129,6 @@ typedef int tlsext_servername_callback(const SSL *ssl, int *alert, void *arg); """ FUNCTIONS = """ -void OPENSSL_free(void *); int SSL_library_init(); /* SSL */ |