From 99d0f90ff256b540acb007458bbb07c467642368 Mon Sep 17 00:00:00 2001 From: Andre Caron Date: Mon, 1 Jun 2015 08:36:59 -0400 Subject: Removes CSR builder version setter. --- src/cryptography/hazmat/backends/openssl/backend.py | 2 +- src/cryptography/x509.py | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index a6acb076..c32b5270 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -819,7 +819,7 @@ class Backend(object): assert x509_req != self._ffi.NULL # Set x509 version. - res = self._lib.X509_REQ_set_version(x509_req, builder._version.value) + res = self._lib.X509_REQ_set_version(x509_req, x509.Version.v1.value) assert res == 1 # Set subject name. diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index c59de606..b1aa0679 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -1445,33 +1445,20 @@ class RevokedCertificate(object): class CertificateSigningRequestBuilder(object): - def __init__(self, version=Version.v1, subject_name=None, extensions=[]): + def __init__(self, subject_name=None, extensions=[]): """ Creates an empty X.509 certificate request (v1). """ - self._version = Version.v1 self._subject_name = subject_name self._extensions = extensions[:] - def set_version(self, version): - """ - Sets the X.509 version. - """ - if not isinstance(version, Version): - raise TypeError('Expecting x509.Version object.') - return CertificateSigningRequestBuilder( - version, self._subject_name, self._extensions - ) - def set_subject_name(self, name): """ Sets the certificate requestor's distinguished name. """ if not isinstance(name, Name): raise TypeError('Expecting x509.Name object.') - return CertificateSigningRequestBuilder( - self._version, name, self._extensions - ) + return CertificateSigningRequestBuilder(name, self._extensions) def add_extension(self, extension): """ @@ -1483,7 +1470,7 @@ class CertificateSigningRequestBuilder(object): if e.oid == extension.oid: raise ValueError('This extension has already been set.') return CertificateSigningRequestBuilder( - self._version, self._subject_name, self._extensions + [extension] + self._subject_name, self._extensions + [extension] ) def sign(self, backend, private_key, algorithm): -- cgit v1.2.3