From a699167bbfa2e7cfdc1818697c184fa18535d6f8 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 9 Apr 2017 09:18:15 -0400 Subject: Fixed #3492 -- use a better API (#3497) * Fixed #3492 -- use a better API * More correct types * Revert "More correct types" This reverts commit e7412927eccf2b983bbcab2d2864ae1e4e83b56f. --- src/_cffi_src/openssl/x509v3.py | 1 + src/cryptography/hazmat/backends/openssl/decode_asn1.py | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src') 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 = [] -- cgit v1.2.3