aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2015-07-24 14:52:18 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2015-07-24 14:52:18 -0500
commit893246fd6b6dcefa270777e7cb8261a3131a2745 (patch)
tree42990362c1802d2ee02f2ce3e630483593b82be8 /src
parent7644383e13f2dcc1e70e19a157b28608cc072830 (diff)
downloadcryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.tar.gz
cryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.tar.bz2
cryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.zip
Remove CertificateBuilder.version
Default CertificateBuilder to Version.v3
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 6f7aeeed..4b13fce1 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1605,7 +1605,7 @@ class CertificateBuilder(object):
"""
Creates an empty X.509 certificate (version 1).
"""
- self._version = version
+ self._version = Version.v3
self._issuer_name = issuer_name
self._subject_name = subject_name
self._public_key = public_key
@@ -1614,20 +1614,6 @@ class CertificateBuilder(object):
self._not_valid_after = not_valid_after
self._extensions = extensions
- def version(self, version):
- """
- Sets the X.509 version required by decoders.
- """
- if not isinstance(version, Version):
- raise TypeError('Expecting x509.Version object.')
- if self._version is not None:
- raise ValueError('The version may only be set once.')
- return CertificateBuilder(
- version, self._issuer_name, self._subject_name, self._public_key,
- self._serial_number, self._not_valid_before,
- self._not_valid_after, self._extensions
- )
-
def issuer_name(self, name):
"""
Sets the CA's distinguished name.
@@ -1744,7 +1730,4 @@ class CertificateBuilder(object):
"""
Signs the certificate using the CA's private key.
"""
- builder = self
- if self._version is None:
- builder = self.version(Version.v3)
- return backend.sign_x509_certificate(builder, private_key, algorithm)
+ return backend.sign_x509_certificate(self, private_key, algorithm)