aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Trauschke <erik.trauschke@gmail.com>2015-05-28 10:24:25 -0700
committerErik Trauschke <erik.trauschke@gmail.com>2015-05-28 10:24:25 -0700
commitc5a8d1724de78e0fa9c6cd9bf8ee6373c1a83ccb (patch)
tree65a7d1530ff26f4a513c1d503dde8b73b9d6d8b3
parentabb7b6ed99538e49f606b00f3219a2fd568c59d6 (diff)
downloadcryptography-c5a8d1724de78e0fa9c6cd9bf8ee6373c1a83ccb.tar.gz
cryptography-c5a8d1724de78e0fa9c6cd9bf8ee6373c1a83ccb.tar.bz2
cryptography-c5a8d1724de78e0fa9c6cd9bf8ee6373c1a83ccb.zip
removed verify(), various small fixes
-rw-r--r--docs/x509.rst12
-rw-r--r--src/cryptography/x509.py12
2 files changed, 4 insertions, 20 deletions
diff --git a/docs/x509.rst b/docs/x509.rst
index 7e84b492..23a70f45 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -390,16 +390,6 @@ X.509 CRL (Certificate Revocation List) Object
The extensions encoded in the CRL.
- .. method:: verify(public_key)
-
- :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`
- that will be used to verify the CRL.
-
- :return boolean: The result of the verification as boolean value.
-
X.509 CSR (Certificate Signing Request) Object
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,7 +444,7 @@ X.509 CSR (Certificate Signing Request) Object
authority.
X.509 Revoked Certificate Object
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. class:: RevokedCertificate
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index c4ada20e..0aeafa74 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -55,9 +55,9 @@ _OID_NAMES = {
"2.5.29.17": "subjectAltName",
"2.5.29.18": "issuerAltName",
"2.5.29.19": "basicConstraints",
- "2.5.29.21": "CRLReason",
- "2.5.29.24": "InvalidityDate",
- "2.5.29.29": "CertificateIssuer",
+ "2.5.29.21": "cRLReason",
+ "2.5.29.24": "invalidityDate",
+ "2.5.29.29": "certificateIssuer",
"2.5.29.30": "nameConstraints",
"2.5.29.31": "cRLDistributionPoints",
"2.5.29.32": "certificatePolicies",
@@ -1253,12 +1253,6 @@ class CertificateRevocationList(object):
"""
@abc.abstractmethod
- def verify(self, pubkey):
- """
- Verify this CRL against a given 'pubkey'.
- """
-
- @abc.abstractmethod
def __eq__(self, other):
"""
Checks equality.