diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-08 23:44:23 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-08 23:44:23 -0500 |
| commit | a6877ecc70e3e83c332be16943dc77e25acced61 (patch) | |
| tree | 7f3a808c9d124555d45018e21fa577f5c9b4cb4f /src | |
| parent | 87a76094d85b133e829366a2f8de96462a3037ec (diff) | |
| parent | 8bb4a42ed4a25309e5df47a44fd236d2cfbc4d43 (diff) | |
| download | cryptography-a6877ecc70e3e83c332be16943dc77e25acced61.tar.gz cryptography-a6877ecc70e3e83c332be16943dc77e25acced61.tar.bz2 cryptography-a6877ecc70e3e83c332be16943dc77e25acced61.zip | |
Merge pull request #2779 from reaperhulk/110-patch-3
ASN1_TIME is actually an ASN1_STRING so typedef it
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 30bd2451..5d45c583 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -24,6 +24,7 @@ struct asn1_string_st { typedef struct asn1_string_st ASN1_OCTET_STRING; typedef struct asn1_string_st ASN1_IA5STRING; typedef struct asn1_string_st ASN1_BIT_STRING; +typedef struct asn1_string_st ASN1_TIME; typedef ... ASN1_OBJECT; typedef struct asn1_string_st ASN1_STRING; typedef struct asn1_string_st ASN1_UTF8STRING; @@ -33,9 +34,6 @@ typedef ... ASN1_ENUMERATED; typedef ... ASN1_ITEM; typedef ... ASN1_VALUE; -typedef struct { - ...; -} ASN1_TIME; typedef ... ASN1_ITEM_EXP; typedef ... ASN1_UTCTIME; |