From a1a1f2325ef8ea0a1d467dcafa8fffde98a5a7c3 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 15 Mar 2015 15:34:35 -0500 Subject: rename to CertificateSigningRequest --- src/cryptography/hazmat/backends/openssl/backend.py | 6 ++++-- src/cryptography/hazmat/backends/openssl/x509.py | 4 ++-- src/cryptography/x509.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 48fdcb72..6cc3fd91 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -34,7 +34,9 @@ from cryptography.hazmat.backends.openssl.hmac import _HMACContext from cryptography.hazmat.backends.openssl.rsa import ( _RSAPrivateKey, _RSAPublicKey ) -from cryptography.hazmat.backends.openssl.x509 import _CSR, _Certificate +from cryptography.hazmat.backends.openssl.x509 import ( + _Certificate, _CertificateSigningRequest +) from cryptography.hazmat.bindings.openssl.binding import Binding from cryptography.hazmat.primitives import hashes, serialization from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa @@ -830,7 +832,7 @@ class Backend(object): raise ValueError("Unable to load request") x509_req = self._ffi.gc(x509_req, self._lib.X509_REQ_free) - return _CSR(self, x509_req) + return _CertificateSigningRequest(self, x509_req) def _load_key(self, openssl_read_func, convert_func, data, password): mem_bio = self._bytes_to_bio(data) diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index e936201e..2b66c21e 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -218,8 +218,8 @@ class _Certificate(object): return x509.BasicConstraints(ca, path_length) -@utils.register_interface(x509.CSR) -class _CSR(object): +@utils.register_interface(x509.CertificateSigningRequest) +class _CertificateSigningRequest(object): def __init__(self, backend, x509_req): self._backend = backend self._x509_req = x509_req diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index d58ca0bb..25bbe9ca 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -343,7 +343,7 @@ class Certificate(object): @six.add_metaclass(abc.ABCMeta) -class CSR(object): +class CertificateSigningRequest(object): @abc.abstractmethod def public_key(self): """ -- cgit v1.2.3