aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/x509/reference.rst2
-rw-r--r--tests/test_x509.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index 9d5006ae..2029c08f 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -405,7 +405,7 @@ X.509 Certificate Builder
Sets the subject's distinguished name.
:param name: The :class:`~cryptography.x509.Name` that describes the
- subject (requester).
+ subject.
.. method:: public_key(public_key)
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 341818af..2aea2f53 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -22,7 +22,7 @@ from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa
from .hazmat.primitives.fixtures_dsa import DSA_KEY_2048
-from .hazmat.primitives.fixtures_rsa import RSA_KEY_512, RSA_KEY_2048
+from .hazmat.primitives.fixtures_rsa import RSA_KEY_2048, RSA_KEY_512
from .hazmat.primitives.test_ec import _skip_curve_unsupported
from .utils import load_vectors_from_file
@@ -1031,7 +1031,7 @@ class TestCertificateBuilder(object):
@pytest.mark.requires_backend_interface(interface=EllipticCurveBackend)
@pytest.mark.requires_backend_interface(interface=X509Backend)
- def test_build_cert_with_dsa_private_key(self, backend):
+ def test_build_cert_with_ec_private_key(self, backend):
if backend._lib.OPENSSL_VERSION_NUMBER < 0x10001000:
pytest.skip("Requires a newer OpenSSL. Must be >= 1.0.1")