From abb7b6ed99538e49f606b00f3219a2fd568c59d6 Mon Sep 17 00:00:00 2001 From: Erik Trauschke Date: Wed, 27 May 2015 15:07:35 -0700 Subject: doc fixes, rename rekoked -> revoked_certificates --- docs/x509.rst | 6 +++--- src/cryptography/x509.py | 2 +- 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. """ -- cgit v1.2.3