diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-19 16:13:53 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-19 16:13:53 -0800 |
| commit | cde832d298687a0623b67aeda674635bf1bcdf77 (patch) | |
| tree | 4065a322f88081c45514eab6e6808d06a5f968b8 | |
| parent | 552b0424843c7c3be07bb6dfdf6e60f7cd5a760a (diff) | |
| parent | 99fdc809e5ee05785d31af7da37dbed2326c8e5b (diff) | |
| download | cryptography-cde832d298687a0623b67aeda674635bf1bcdf77.tar.gz cryptography-cde832d298687a0623b67aeda674635bf1bcdf77.tar.bz2 cryptography-cde832d298687a0623b67aeda674635bf1bcdf77.zip | |
Merge pull request #320 from alex/cleanup-asn1-crap
Attempt to handle the fact that based on defines ASN1_ITEM_EXP might be something else
| -rw-r--r-- | cryptography/hazmat/backends/openssl/asn1.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptography/hazmat/backends/openssl/asn1.py b/cryptography/hazmat/backends/openssl/asn1.py index 719a523c..c752e682 100644 --- a/cryptography/hazmat/backends/openssl/asn1.py +++ b/cryptography/hazmat/backends/openssl/asn1.py @@ -41,7 +41,7 @@ typedef ... ASN1_VALUE; typedef struct { ...; } ASN1_TIME; -typedef const ASN1_ITEM ASN1_ITEM_EXP; +typedef ... ASN1_ITEM_EXP; typedef ... ASN1_UTCTIME; @@ -102,7 +102,7 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **, const unsigned char **, long, MACROS = """ ASN1_TIME *M_ASN1_TIME_dup(void *); -ASN1_ITEM *ASN1_ITEM_ptr(ASN1_ITEM *); +ASN1_ITEM *ASN1_ITEM_ptr(ASN1_ITEM_EXP *); /* These aren't macros these arguments are all const X on openssl > 1.0.x */ |