diff options
| author | Andre Caron <andre.l.caron@gmail.com> | 2015-06-01 08:36:59 -0400 |
|---|---|---|
| committer | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-06-24 13:35:49 -0500 |
| commit | 99d0f90ff256b540acb007458bbb07c467642368 (patch) | |
| tree | 00f52208f7707dd1b4b469cc310d6ccd828dbbdc /tests/test_x509.py | |
| parent | 0fdf009ea0dc96a1d70ab0cded11d5846b03d4e2 (diff) | |
| download | cryptography-99d0f90ff256b540acb007458bbb07c467642368.tar.gz cryptography-99d0f90ff256b540acb007458bbb07c467642368.tar.bz2 cryptography-99d0f90ff256b540acb007458bbb07c467642368.zip | |
Removes CSR builder version setter.
Diffstat (limited to 'tests/test_x509.py')
| -rw-r--r-- | tests/test_x509.py | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/tests/test_x509.py b/tests/test_x509.py index 981ad528..aadbed02 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -699,15 +699,15 @@ class TestCertificateSigningRequestBuilder(object): backend=backend, ) - request = x509.CertificateSigningRequestBuilder().set_version( - x509.Version.v3 - ).set_subject_name(x509.Name([ - x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), - x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), - x509.NameAttribute(x509.OID_LOCALITY_NAME, 'Austin'), - x509.NameAttribute(x509.OID_ORGANIZATION_NAME, 'PyCA'), - x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), - ])).add_extension(x509.Extension( + request = x509.CertificateSigningRequestBuilder().set_subject_name( + x509.Name([ + x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), + x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), + x509.NameAttribute(x509.OID_LOCALITY_NAME, 'Austin'), + x509.NameAttribute(x509.OID_ORGANIZATION_NAME, 'PyCA'), + x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), + ]) + ).add_extension(x509.Extension( x509.OID_BASIC_CONSTRAINTS, True, x509.BasicConstraints(True, 2), @@ -740,15 +740,15 @@ class TestCertificateSigningRequestBuilder(object): backend=backend, ) - request = x509.CertificateSigningRequestBuilder().set_version( - x509.Version.v3 - ).set_subject_name(x509.Name([ - x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), - x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), - x509.NameAttribute(x509.OID_LOCALITY_NAME, 'Austin'), - x509.NameAttribute(x509.OID_ORGANIZATION_NAME, 'PyCA'), - x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), - ])).add_extension(x509.Extension( + request = x509.CertificateSigningRequestBuilder().set_subject_name( + x509.Name([ + x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), + x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), + x509.NameAttribute(x509.OID_LOCALITY_NAME, 'Austin'), + x509.NameAttribute(x509.OID_ORGANIZATION_NAME, 'PyCA'), + x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), + ]) + ).add_extension(x509.Extension( x509.OID_BASIC_CONSTRAINTS, True, x509.BasicConstraints(False, None), @@ -799,11 +799,6 @@ class TestCertificateSigningRequestBuilder(object): with pytest.raises(TypeError): builder.set_subject_name('NotAName') - def test_set_invalid_version(self, backend): - builder = x509.CertificateSigningRequestBuilder() - with pytest.raises(TypeError): - builder.set_version('NotAVersion') - def test_add_unsupported_extension(self, backend): private_key = rsa.generate_private_key( public_exponent=65537, |