diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-04-09 09:18:15 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-04-09 21:18:15 +0800 |
| commit | a699167bbfa2e7cfdc1818697c184fa18535d6f8 (patch) | |
| tree | 32376c3b8344e13c141abb3a8fbdf61f0e8c535a /src | |
| parent | ef027a69808d045dffc3b4db274d67cea1be9f3a (diff) | |
| download | cryptography-a699167bbfa2e7cfdc1818697c184fa18535d6f8.tar.gz cryptography-a699167bbfa2e7cfdc1818697c184fa18535d6f8.tar.bz2 cryptography-a699167bbfa2e7cfdc1818697c184fa18535d6f8.zip | |
Fixed #3492 -- use a better API (#3497)
* Fixed #3492 -- use a better API
* More correct types
* Revert "More correct types"
This reverts commit e7412927eccf2b983bbcab2d2864ae1e4e83b56f.
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 1 | ||||
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/decode_asn1.py | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index 164c1a58..30cb99cb 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -248,6 +248,7 @@ DIST_POINT *sk_DIST_POINT_value(Cryptography_STACK_OF_DIST_POINT *, int); int sk_DIST_POINT_push(Cryptography_STACK_OF_DIST_POINT *, DIST_POINT *); void sk_DIST_POINT_pop_free(Cryptography_STACK_OF_DIST_POINT *, sk_DIST_POINT_freefunc); +void CRL_DIST_POINTS_free(Cryptography_STACK_OF_DIST_POINT *); void sk_POLICYINFO_free(Cryptography_STACK_OF_POLICYINFO *); int sk_POLICYINFO_num(Cryptography_STACK_OF_POLICYINFO *); diff --git a/src/cryptography/hazmat/backends/openssl/decode_asn1.py b/src/cryptography/hazmat/backends/openssl/decode_asn1.py index 00937421..9ff38c97 100644 --- a/src/cryptography/hazmat/backends/openssl/decode_asn1.py +++ b/src/cryptography/hazmat/backends/openssl/decode_asn1.py @@ -496,13 +496,7 @@ _DISTPOINT_TYPE_RELATIVENAME = 1 def _decode_crl_distribution_points(backend, cdps): cdps = backend._ffi.cast("Cryptography_STACK_OF_DIST_POINT *", cdps) - - dp_freefunc = backend._ffi.addressof( - backend._lib._original_lib, "DIST_POINT_free" - ) - cdps = backend._ffi.gc( - cdps, lambda c: backend._lib.sk_DIST_POINT_pop_free(c, dp_freefunc) - ) + cdps = backend._ffi.gc(cdps, backend._lib.CRL_DIST_POINTS_free) num = backend._lib.sk_DIST_POINT_num(cdps) dist_points = [] |