aboutsummaryrefslogtreecommitdiffstats
path: root/tests
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 /tests
parent7644383e13f2dcc1e70e19a157b28608cc072830 (diff)
downloadcryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.tar.gz
cryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.tar.bz2
cryptography-893246fd6b6dcefa270777e7cb8261a3131a2745.zip
Remove CertificateBuilder.version
Default CertificateBuilder to Version.v3
Diffstat (limited to 'tests')
-rw-r--r--tests/hazmat/backends/test_openssl.py4
-rw-r--r--tests/test_x509.py18
2 files changed, 2 insertions, 20 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 5505c630..daa37874 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -489,9 +489,7 @@ class TestOpenSSLSignX509Certificate(object):
def test_checks_for_unsupported_extensions(self):
private_key = RSA_KEY_2048.private_key(backend)
- builder = x509.CertificateBuilder().version(
- x509.Version.v3
- ).subject_name(x509.Name([
+ builder = x509.CertificateBuilder().subject_name(x509.Name([
x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
diff --git a/tests/test_x509.py b/tests/test_x509.py
index c4a423aa..e052b4d9 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -782,9 +782,7 @@ class TestRSACertificateRequest(object):
not_valid_before = datetime.datetime(2002, 1, 1, 12, 1)
not_valid_after = datetime.datetime(2030, 12, 31, 8, 30)
- builder = x509.CertificateBuilder().version(
- x509.Version.v3
- ).serial_number(
+ builder = x509.CertificateBuilder().serial_number(
777
).issuer_name(x509.Name([
x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
@@ -824,20 +822,6 @@ class TestRSACertificateRequest(object):
class TestCertificateBuilder(object):
- def test_version_must_be_a_version_type(self):
- builder = x509.CertificateBuilder()
-
- with pytest.raises(TypeError):
- builder.version("v1")
-
- def test_version_may_only_be_set_once(self):
- builder = x509.CertificateBuilder().version(
- x509.Version.v3
- )
-
- with pytest.raises(ValueError):
- builder.version(x509.Version.v1)
-
def test_issuer_name_must_be_a_name_type(self):
builder = x509.CertificateBuilder()