diff options
| author | cyli <cyli@twistedmatrix.com> | 2013-10-20 17:15:07 -0700 |
|---|---|---|
| committer | cyli <cyli@twistedmatrix.com> | 2013-12-20 13:39:43 -0800 |
| commit | 272987868860db0d82a3765c7af767cbf12b4397 (patch) | |
| tree | d4a7a96177cdc7fa2b85f72e6b18b0be091f3188 | |
| parent | 02209c6045d8a5702f30c7401dfe6755208edef1 (diff) | |
| download | cryptography-272987868860db0d82a3765c7af767cbf12b4397.tar.gz cryptography-272987868860db0d82a3765c7af767cbf12b4397.tar.bz2 cryptography-272987868860db0d82a3765c7af767cbf12b4397.zip | |
Move some methods to macros that have become const between versions
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index dee5edc5..20b69b11 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -132,17 +132,6 @@ FUNCTIONS = """ void OPENSSL_free(void *); int SSL_library_init(); -/* methods */ -const SSL_METHOD *SSLv3_method(); -const SSL_METHOD *SSLv3_server_method(); -const SSL_METHOD *SSLv3_client_method(); -const SSL_METHOD *TLSv1_method(); -const SSL_METHOD *TLSv1_server_method(); -const SSL_METHOD *TLSv1_client_method(); -const SSL_METHOD *SSLv23_method(); -const SSL_METHOD *SSLv23_server_method(); -const SSL_METHOD *SSLv23_client_method(); - /* SSL */ SSL_CTX *SSL_set_SSL_CTX(SSL *, SSL_CTX *); SSL_SESSION *SSL_get1_session(SSL *); @@ -289,6 +278,17 @@ const SSL_METHOD *SSLv2_method(); const SSL_METHOD *SSLv2_server_method(); const SSL_METHOD *SSLv2_client_method(); +/* methods */ +const SSL_METHOD *SSLv3_method(); +const SSL_METHOD *SSLv3_server_method(); +const SSL_METHOD *SSLv3_client_method(); +const SSL_METHOD *TLSv1_method(); +const SSL_METHOD *TLSv1_server_method(); +const SSL_METHOD *TLSv1_client_method(); +const SSL_METHOD *SSLv23_method(); +const SSL_METHOD *SSLv23_server_method(); +const SSL_METHOD *SSLv23_client_method(); + /*- These aren't macros these arguments are all const X on openssl > 1.0.x -*/ SSL_CTX *SSL_CTX_new(const SSL_METHOD *); long SSL_CTX_get_timeout(const SSL_CTX *); |