diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-27 18:04:21 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-27 18:04:21 -0800 |
| commit | 28f10001a18c96649003c59beb458d8d865aac88 (patch) | |
| tree | 9d15926d96bb6f683db45b17f1456205120fa163 | |
| parent | be5fa6801452647c90540c50051a0c8de82e1f38 (diff) | |
| parent | 1839b19f7ab7795250c662bd2b38fc0bbf1e65a1 (diff) | |
| download | cryptography-28f10001a18c96649003c59beb458d8d865aac88.tar.gz cryptography-28f10001a18c96649003c59beb458d8d865aac88.tar.bz2 cryptography-28f10001a18c96649003c59beb458d8d865aac88.zip | |
Merge pull request #360 from reaperhulk/c-style-part-deux
A few missed functions in the () -> (void) migration
| -rw-r--r-- | cryptography/hazmat/backends/openssl/objects.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cryptography/hazmat/backends/openssl/objects.py b/cryptography/hazmat/backends/openssl/objects.py index ad1b8588..0abc42d6 100644 --- a/cryptography/hazmat/backends/openssl/objects.py +++ b/cryptography/hazmat/backends/openssl/objects.py @@ -31,7 +31,7 @@ int OBJ_obj2txt(char *, int, const ASN1_OBJECT *, int); int OBJ_cmp(const ASN1_OBJECT *, const ASN1_OBJECT *); ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *); int OBJ_create(const char *, const char *, const char *); -void OBJ_cleanup(); +void OBJ_cleanup(void); """ MACROS = """ diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 49b142ca..fb3b17e6 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -255,9 +255,9 @@ void SSL_CTX_set_tlsext_servername_callback( CUSTOMIZATIONS = """ #ifdef OPENSSL_NO_SSL2 static const long Cryptography_HAS_SSL2 = 0; -SSL_METHOD* (*SSLv2_method)() = NULL; -SSL_METHOD* (*SSLv2_client_method)() = NULL; -SSL_METHOD* (*SSLv2_server_method)() = NULL; +SSL_METHOD* (*SSLv2_method)(void) = NULL; +SSL_METHOD* (*SSLv2_client_method)(void) = NULL; +SSL_METHOD* (*SSLv2_server_method)(void) = NULL; #else static const long Cryptography_HAS_SSL2 = 1; #endif |