diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-11 07:57:56 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-11 07:57:56 -0700 |
| commit | cc23b5b3ea1a3f72a8739c5ea0140211b635a961 (patch) | |
| tree | 06ce01d60c10fd8e2522d46c3f878c640f46b729 | |
| parent | c99c2148fa8f27678acab4d9d02297cf097c77cf (diff) | |
| parent | c760817c109702c7dc07a20380950e35173e86bc (diff) | |
| download | cryptography-cc23b5b3ea1a3f72a8739c5ea0140211b635a961.tar.gz cryptography-cc23b5b3ea1a3f72a8739c5ea0140211b635a961.tar.bz2 cryptography-cc23b5b3ea1a3f72a8739c5ea0140211b635a961.zip | |
Merge pull request #780 from reaperhulk/openssl-102-compat
small bindings change to make cryptography work with openssl 1.0.2
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/asn1.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cryptography/hazmat/bindings/openssl/asn1.py b/cryptography/hazmat/bindings/openssl/asn1.py index d908b198..144a893e 100644 --- a/cryptography/hazmat/bindings/openssl/asn1.py +++ b/cryptography/hazmat/bindings/openssl/asn1.py @@ -108,7 +108,6 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *, time_t); /* ASN1 GENERALIZEDTIME */ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *, const char *); void ASN1_GENERALIZEDTIME_free(ASN1_GENERALIZEDTIME *); -int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *); /* ASN1 ENUMERATED */ ASN1_ENUMERATED *ASN1_ENUMERATED_new(void); @@ -138,6 +137,9 @@ long ASN1_INTEGER_get(ASN1_INTEGER *); BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *, BIGNUM *); ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *, ASN1_INTEGER *); + +/* These isn't a macro the arg is const on openssl 1.0.2+ */ +int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *); """ CUSTOMIZATIONS = """ |