diff options
| -rw-r--r-- | docs/x509.rst | 4 | ||||
| -rw-r--r-- | src/cryptography/x509.py | 2 | ||||
| -rw-r--r-- | tests/test_x509.py | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/x509.rst b/docs/x509.rst index d7ab6478..0f55e8e4 100644 --- a/docs/x509.rst +++ b/docs/x509.rst @@ -487,7 +487,7 @@ X.509 CSR (Certificate Signing Request) Builder Object ... backend=default_backend() ... ) >>> builder = x509.CertificateSigningRequestBuilder() - >>> builder = builder.set_subject_name(x509.Name([ + >>> builder = builder.subject_name(x509.Name([ ... x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), ... ])) >>> buidlder = builder.add_extension( @@ -503,7 +503,7 @@ X.509 CSR (Certificate Signing Request) Builder Object Creates an empty certificate signing request. - .. method:: set_subject_name(name) + .. method:: subject_name(name) :param name: The :class:`~cryptography.x509.Name` of the certificate subject. diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index f518b68e..ab4f3c7e 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -1452,7 +1452,7 @@ class CertificateSigningRequestBuilder(object): self._subject_name = subject_name self._extensions = extensions[:] - def set_subject_name(self, name): + def subject_name(self, name): """ Sets the certificate requestor's distinguished name. """ diff --git a/tests/test_x509.py b/tests/test_x509.py index 663b83b2..150eb6fc 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -699,7 +699,7 @@ class TestCertificateSigningRequestBuilder(object): backend=backend, ) - request = x509.CertificateSigningRequestBuilder().set_subject_name( + request = x509.CertificateSigningRequestBuilder().subject_name( x509.Name([ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), @@ -738,7 +738,7 @@ class TestCertificateSigningRequestBuilder(object): backend=backend, ) - request = x509.CertificateSigningRequestBuilder().set_subject_name( + request = x509.CertificateSigningRequestBuilder().subject_name( x509.Name([ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), @@ -782,7 +782,7 @@ class TestCertificateSigningRequestBuilder(object): def test_set_invalid_subject(self, backend): builder = x509.CertificateSigningRequestBuilder() with pytest.raises(TypeError): - builder.set_subject_name('NotAName') + builder.subject_name('NotAName') def test_add_unsupported_extension(self, backend): private_key = rsa.generate_private_key( @@ -790,7 +790,7 @@ class TestCertificateSigningRequestBuilder(object): key_size=2048, backend=backend, ) - builder = x509.CertificateSigningRequestBuilder().set_subject_name( + builder = x509.CertificateSigningRequestBuilder().subject_name( x509.Name([ x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'), x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'), |