aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Trauschke <erik.trauschke@gmail.com>2015-05-27 15:07:35 -0700
committerErik Trauschke <erik.trauschke@gmail.com>2015-05-27 15:07:35 -0700
commitabb7b6ed99538e49f606b00f3219a2fd568c59d6 (patch)
treefe30e7bdcd5543ea8ee4746332fd5eec2fb76a22
parent2dcce90056cb8c2082d5a103212ef045daa8bff3 (diff)
downloadcryptography-abb7b6ed99538e49f606b00f3219a2fd568c59d6.tar.gz
cryptography-abb7b6ed99538e49f606b00f3219a2fd568c59d6.tar.bz2
cryptography-abb7b6ed99538e49f606b00f3219a2fd568c59d6.zip
doc fixes, rename rekoked -> revoked_certificates
-rw-r--r--docs/x509.rst6
-rw-r--r--src/cryptography/x509.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index fa01f046..7e84b492 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -378,7 +378,7 @@ X.509 CRL (Certificate Revocation List) Object
A naïve datetime representing when the this CRL was last updated.
- .. attribute:: revoked
+ .. attribute:: revoked_certificates
:type: list of :class:`RevokedCertificate`
@@ -390,9 +390,9 @@ X.509 CRL (Certificate Revocation List) Object
The extensions encoded in the CRL.
- .. method:: verify(pubkey)
+ .. method:: verify(public_key)
- :param algorithm: The
+ :param public_key: The
:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` or
:class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 421ebfcd..c4ada20e 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1241,7 +1241,7 @@ class CertificateRevocationList(object):
"""
@abc.abstractproperty
- def revoked(self):
+ def revoked_certificates(self):
"""
Returns a list of RevokedCertificate objects for this CRL.
"""