From 3b3b4938ca31a17cf3ac8cb72e0e8ae0c111ff15 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 8 Mar 2016 21:21:09 -0400 Subject: handle removal of M_ASN1_TIME_dup OpenSSL 1.1.0 compat work --- src/_cffi_src/openssl/asn1.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/_cffi_src/openssl/asn1.py') diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 30bd2451..95bb0f2e 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -155,4 +155,11 @@ 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 """ -- cgit v1.2.3