diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 09:18:19 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 09:18:19 -0500 |
| commit | 7a2bc40a6be4f714b882c4c5f0a174422e028bac (patch) | |
| tree | 8e219fc1cfceab74ceacaf72748a1068183488bf | |
| parent | 18e5120fc44efff743b1b673b46b8173257c2aab (diff) | |
| parent | 610b48a2a0a9232e9346238ab67d09a04d3d919a (diff) | |
| download | cryptography-7a2bc40a6be4f714b882c4c5f0a174422e028bac.tar.gz cryptography-7a2bc40a6be4f714b882c4c5f0a174422e028bac.tar.bz2 cryptography-7a2bc40a6be4f714b882c4c5f0a174422e028bac.zip | |
Merge pull request #2778 from reaperhulk/110-patch-2
handle removal of M_ASN1_TIME_dup
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 5d45c583..084eec2c 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -153,4 +153,10 @@ ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **, const unsigned char **, long); """ CUSTOMIZATIONS = """ +/* This macro is removed in 1.1.0. We re-add it if required to support + pyOpenSSL versions older than whatever resolves + https://github.com/pyca/pyopenssl/issues/431 */ +#if !defined(M_ASN1_TIME_dup) +#define M_ASN1_TIME_dup(a) (ASN1_TIME *)ASN1_STRING_dup((const ASN1_STRING *)a) +#endif """ |