Merge branch 'master' into encode-san

2 files changed, 14 insertions, 3 deletions

diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index a091cd78..afd28f20 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1473,9 +1473,7 @@ class CertificateSigningRequestBuilder(object):
                 OID_SUBJECT_ALTERNATIVE_NAME, critical, extension
             )
         elif isinstance(extension, KeyUsage):
-            extension = Extension(
-                OID_KEY_USAGE, critical, extension
-            )
+            extension = Extension(OID_KEY_USAGE, critical, extension)
         else:
             raise NotImplementedError('Unsupported X.509 extension.')
         # TODO: This is quadratic in the number of extensions
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 133f0535..3491446d 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -876,6 +876,19 @@ class TestCertificateSigningRequestBuilder(object):
                 decipher_only=False
             ),
             critical=False,
+        ).add_extension(
+            x509.KeyUsage(
+                digital_signature=True,
+                content_commitment=True,
+                key_encipherment=False,
+                data_encipherment=False,
+                key_agreement=False,
+                key_cert_sign=True,
+                crl_sign=False,
+                encipher_only=False,
+                decipher_only=False
+            ),
+            critical=False
         )
         with pytest.raises(NotImplementedError):
             builder.sign(private_key, hashes.SHA256(), backend)