aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndre Caron <andre.l.caron@gmail.com>2015-06-01 08:36:59 -0400
committerIan Cordasco <graffatcolmingov@gmail.com>2015-06-24 13:35:49 -0500
commit99d0f90ff256b540acb007458bbb07c467642368 (patch)
tree00f52208f7707dd1b4b469cc310d6ccd828dbbdc /src
parent0fdf009ea0dc96a1d70ab0cded11d5846b03d4e2 (diff)
downloadcryptography-99d0f90ff256b540acb007458bbb07c467642368.tar.gz
cryptography-99d0f90ff256b540acb007458bbb07c467642368.tar.bz2
cryptography-99d0f90ff256b540acb007458bbb07c467642368.zip
Removes CSR builder version setter.
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py2
-rw-r--r--src/cryptography/x509.py19
2 files changed, 4 insertions, 17 deletions
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):