From e76cd27c28f75f3972ddcf5e15d5e37e6da2098e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 14 Dec 2014 19:00:51 -0600 Subject: rename X509 classes to remove X509 and improve some tests --- src/cryptography/hazmat/backends/openssl/backend.py | 6 +++--- src/cryptography/hazmat/backends/openssl/x509.py | 10 +++++----- src/cryptography/x509.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 10341fa2..daccf5ca 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -36,7 +36,7 @@ from cryptography.hazmat.backends.openssl.hmac import _HMACContext from cryptography.hazmat.backends.openssl.rsa import ( _RSAPrivateKey, _RSAPublicKey ) -from cryptography.hazmat.backends.openssl.x509 import _X509Certificate +from cryptography.hazmat.backends.openssl.x509 import _Certificate from cryptography.hazmat.bindings.openssl.binding import Binding from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa @@ -709,7 +709,7 @@ class Backend(object): raise ValueError("Unable to load certificate") x509 = self._ffi.gc(x509, self._lib.X509_free) - return _X509Certificate(self, x509) + return _Certificate(self, x509) def load_der_x509_certificate(self, data): mem_bio = self._bytes_to_bio(data) @@ -719,7 +719,7 @@ class Backend(object): raise ValueError("Unable to load certificate") x509 = self._ffi.gc(x509, self._lib.X509_free) - return _X509Certificate(self, x509) + return _Certificate(self, x509) def load_traditional_openssl_pem_private_key(self, data, password): warnings.warn( diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 17dd098f..26c5edc2 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -19,8 +19,8 @@ from cryptography import utils, x509 from cryptography.hazmat.primitives import hashes -@utils.register_interface(x509.X509Certificate) -class _X509Certificate(object): +@utils.register_interface(x509.Certificate) +class _Certificate(object): def __init__(self, backend, x509): self._backend = backend self._x509 = x509 @@ -40,11 +40,11 @@ class _X509Certificate(object): def version(self): version = self._backend._lib.X509_get_version(self._x509) if version == 0: - return x509.X509Version.v1 + return x509.Version.v1 elif version == 2: - return x509.X509Version.v3 + return x509.Version.v3 else: - raise x509.InvalidX509Version( + raise x509.InvalidVersion( "{0} is not a valid X509 version".format(version) ) diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index ed754cbc..c79d1171 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -10,7 +10,7 @@ from enum import Enum import six -class X509Version(Enum): +class Version(Enum): v1 = 0 v3 = 2 @@ -23,12 +23,12 @@ def load_der_x509_certificate(data, backend): return backend.load_der_x509_certificate(data) -class InvalidX509Version(Exception): +class InvalidVersion(Exception): pass @six.add_metaclass(abc.ABCMeta) -class X509Certificate(object): +class Certificate(object): @abc.abstractmethod def fingerprint(self, algorithm): """ -- cgit v1.2.3