aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-20 20:32:49 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-20 20:32:49 -0500
commit394cca58a7dbd7e34d111f8c78a8f2dabda3a4b3 (patch)
tree41e339b1b46f8531725e0fe6f27f976eb5863d05 /src
parent45b8752fd2e7c40dcdbe655461815206d3372baf (diff)
parent9543a33eb63564c3fe04efbc451b2f6c742be4fe (diff)
downloadcryptography-394cca58a7dbd7e34d111f8c78a8f2dabda3a4b3.tar.gz
cryptography-394cca58a7dbd7e34d111f8c78a8f2dabda3a4b3.tar.bz2
cryptography-394cca58a7dbd7e34d111f8c78a8f2dabda3a4b3.zip
Merge pull request #2538 from reaperhulk/empty-crls-are-beautiful-too
support CRLs with no revoked certificates
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/x509.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 4e91bf43..f50a0d5d 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -835,14 +835,13 @@ class _CertificateRevocationList(object):
def _revoked_certificates(self):
revoked = self._backend._lib.X509_CRL_get_REVOKED(self._x509_crl)
- self._backend.openssl_assert(revoked != self._backend._ffi.NULL)
-
- num = self._backend._lib.sk_X509_REVOKED_num(revoked)
revoked_list = []
- for i in range(num):
- r = self._backend._lib.sk_X509_REVOKED_value(revoked, i)
- self._backend.openssl_assert(r != self._backend._ffi.NULL)
- revoked_list.append(_RevokedCertificate(self._backend, r))
+ if revoked != self._backend._ffi.NULL:
+ num = self._backend._lib.sk_X509_REVOKED_num(revoked)
+ for i in range(num):
+ r = self._backend._lib.sk_X509_REVOKED_value(revoked, i)
+ self._backend.openssl_assert(r != self._backend._ffi.NULL)
+ revoked_list.append(_RevokedCertificate(self._backend, r))
return revoked_list