diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-25 20:02:59 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-25 20:02:59 -0500 |
commit | 4f76921ad87d71067158625aa0afedbba8ae1314 (patch) | |
tree | 294cb29dc365c5a70dbf15768549d45ea98a3027 /src/cryptography/hazmat/backends/openssl/x509.py | |
parent | baacf1a8ca88a3873d7c4cc3055b1e4564c879c4 (diff) | |
parent | fd4028e73ac508c94148cf803170ec792a94a66f (diff) | |
download | cryptography-4f76921ad87d71067158625aa0afedbba8ae1314.tar.gz cryptography-4f76921ad87d71067158625aa0afedbba8ae1314.tar.bz2 cryptography-4f76921ad87d71067158625aa0afedbba8ae1314.zip |
Merge pull request #2574 from reaperhulk/rename-crlextension
rename CRLExtensionOID to CRLEntryExtensionOID
Diffstat (limited to 'src/cryptography/hazmat/backends/openssl/x509.py')
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index a470adbd..f3286b05 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -20,7 +20,7 @@ from cryptography import utils, x509 from cryptography.exceptions import UnsupportedAlgorithm from cryptography.hazmat.primitives import hashes, serialization from cryptography.x509.oid import ( - CRLExtensionOID, CertificatePoliciesOID, ExtensionOID + CRLEntryExtensionOID, CertificatePoliciesOID, ExtensionOID ) @@ -740,7 +740,7 @@ def _decode_cert_issuer(backend, ext): backend._consume_errors() raise ValueError( "The {0} extension is corrupted and can't be parsed".format( - CRLExtensionOID.CERTIFICATE_ISSUER)) + CRLEntryExtensionOID.CERTIFICATE_ISSUER)) gns = backend._ffi.gc(gns, backend._lib.GENERAL_NAMES_free) return x509.GeneralNames(_decode_general_names(backend, gns)) @@ -992,13 +992,13 @@ _EXTENSION_HANDLERS = { } _REVOKED_EXTENSION_HANDLERS = { - CRLExtensionOID.CRL_REASON: _decode_crl_reason, - CRLExtensionOID.INVALIDITY_DATE: _decode_invalidity_date, - CRLExtensionOID.CERTIFICATE_ISSUER: _decode_cert_issuer, + CRLEntryExtensionOID.CRL_REASON: _decode_crl_reason, + CRLEntryExtensionOID.INVALIDITY_DATE: _decode_invalidity_date, + CRLEntryExtensionOID.CERTIFICATE_ISSUER: _decode_cert_issuer, } _REVOKED_UNSUPPORTED_EXTENSIONS = set([ - CRLExtensionOID.CERTIFICATE_ISSUER, + CRLEntryExtensionOID.CERTIFICATE_ISSUER, ]) _CRL_EXTENSION_HANDLERS = { |