diff options
| author | cyli <cyli@twistedmatrix.com> | 2013-11-11 16:11:29 -0800 |
|---|---|---|
| committer | cyli <cyli@twistedmatrix.com> | 2013-12-20 13:39:45 -0800 |
| commit | 9f2182543e782cde17c1b46908d4c8e8ff01b8fc (patch) | |
| tree | 306c963d6a576c2c82497cdb4956feda7f8eb65b | |
| parent | 1c6110923d12b877390dcaa2ca07080261fca38d (diff) | |
| download | cryptography-9f2182543e782cde17c1b46908d4c8e8ff01b8fc.tar.gz cryptography-9f2182543e782cde17c1b46908d4c8e8ff01b8fc.tar.bz2 cryptography-9f2182543e782cde17c1b46908d4c8e8ff01b8fc.zip | |
Remove OPENSSL_malloc, which was causing errors, and remove the two vars that were problematic in 0.9.8
| -rw-r--r-- | cryptography/hazmat/backends/openssl/crypto.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cryptography/hazmat/backends/openssl/crypto.py b/cryptography/hazmat/backends/openssl/crypto.py index c4300ee0..11e5f2f5 100644 --- a/cryptography/hazmat/backends/openssl/crypto.py +++ b/cryptography/hazmat/backends/openssl/crypto.py @@ -36,8 +36,6 @@ void CRYPTO_malloc_debug_init(); #define CRYPTO_MEM_CHECK_OFF ... #define CRYPTO_MEM_CHECK_ENABLE ... #define CRYPTO_MEM_CHECK_DISABLE ... - -#define OPENSSL_malloc ... """ CUSTOMIZATIONS = """ diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 3de2e1e0..a3a718bf 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -54,7 +54,6 @@ static const int SSL_OP_PKCS1_CHECK_1; static const int SSL_OP_PKCS1_CHECK_2; static const int SSL_OP_NETSCAPE_CA_DN_BUG; static const int SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG; -static const int SSL_OP_NO_COMPRESSION; static const int SSL_OP_NO_QUERY_MTU; static const int SSL_OP_COOKIE_EXCHANGE; static const int SSL_OP_NO_TICKET; @@ -91,7 +90,6 @@ static const int SSL_CB_CONNECT_LOOP; static const int SSL_CB_CONNECT_EXIT; static const int SSL_CB_HANDSHAKE_START; static const int SSL_CB_HANDSHAKE_DONE; -static const int SSL_MODE_RELEASE_BUFFERS; static const int SSL_MODE_ENABLE_PARTIAL_WRITE; static const int SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER; static const int SSL_MODE_AUTO_RETRY; |