From cc4c323f1192d81f46aa2da402f7b916fa120e02 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 23 Dec 2015 23:22:35 -0500 Subject: Improve the performance of len(crl) --- src/cryptography/hazmat/backends/openssl/x509.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 12f5d46f..b342cd8a 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -865,8 +865,7 @@ class _CertificateRevocationList(object): revoked = self._backend._lib.X509_CRL_get_REVOKED(self._x509_crl) revoked_list = [] if revoked != self._backend._ffi.NULL: - num = self._backend._lib.sk_X509_REVOKED_num(revoked) - for i in range(num): + for i in range(len(self)): r = self._backend._lib.sk_X509_REVOKED_value(revoked, i) self._backend.openssl_assert(r != self._backend._ffi.NULL) revoked_certificate = _RevokedCertificate( @@ -883,7 +882,11 @@ class _CertificateRevocationList(object): return self._revoked_certificates()[idx] def __len__(self): - return len(self._revoked_certificates()) + revoked = self._backend._lib.X509_CRL_get_REVOKED(self._x509_crl) + if revoked == self._backend._ffi.NULL: + return 0 + else: + return self._backend._lib.sk_X509_REVOKED_num(revoked) @property def extensions(self): -- cgit v1.2.3