diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-23 15:11:16 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-23 15:11:16 -0500 |
| commit | 7b136459af582427d7f738a905aa3cfaa5b4c195 (patch) | |
| tree | d052da8eadfc60afb9b6b3fda5915340a3275b57 | |
| parent | e9ed22aec48fd3d27db6d8c027493b16a61e2ce3 (diff) | |
| download | cryptography-7b136459af582427d7f738a905aa3cfaa5b4c195.tar.gz cryptography-7b136459af582427d7f738a905aa3cfaa5b4c195.tar.bz2 cryptography-7b136459af582427d7f738a905aa3cfaa5b4c195.zip | |
revert the time_t and BN_ULONG fixes
| -rw-r--r-- | cryptography/hazmat/backends/openssl/asn1.py | 9 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/bignum.py | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/cryptography/hazmat/backends/openssl/asn1.py b/cryptography/hazmat/backends/openssl/asn1.py index 28ec0631..12e8cb35 100644 --- a/cryptography/hazmat/backends/openssl/asn1.py +++ b/cryptography/hazmat/backends/openssl/asn1.py @@ -16,14 +16,7 @@ INCLUDES = """ """ TYPES = """ -/* - * XXX This typedef is wrong. - * https://bitbucket.org/cffi/cffi/issue/69/support-for-using-typedef-with-primitive - * http://paste.pound-python.org/show/iJcTUMkKeBeS6yXpZWUU/ - * < fijal> exarkun: I think you want to declare your value too large (e.g. long) - * < fijal> exarkun: that way you'll never pass garbage - */ -typedef long time_t; +typedef ... time_t; typedef int ASN1_BOOLEAN; typedef ... ASN1_INTEGER; diff --git a/cryptography/hazmat/backends/openssl/bignum.py b/cryptography/hazmat/backends/openssl/bignum.py index 4885d5b4..68d0c3a2 100644 --- a/cryptography/hazmat/backends/openssl/bignum.py +++ b/cryptography/hazmat/backends/openssl/bignum.py @@ -17,14 +17,7 @@ INCLUDES = """ TYPES = """ typedef ... BIGNUM; -/* - * XXX This typedef is wrong. - * https://bitbucket.org/cffi/cffi/issue/69/support-for-using-typedef-with-primitive - * http://paste.pound-python.org/show/iJcTUMkKeBeS6yXpZWUU/ - * < fijal> exarkun: I think you want to declare your value too large (e.g. long) - * < fijal> exarkun: that way you'll never pass garbage - */ -typedef unsigned long long BN_ULONG; +typedef ... BN_ULONG; """ FUNCTIONS = """ |