aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-06-28 11:07:52 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-06-28 11:07:52 -0400
commitac7f70a1dc284339238fcfbdfba4f76476ab3d29 (patch)
tree80d59b3044d85c73c68c8226ffc5baddab514960
parent6eeb877becb90f1a8209a8ac4db96e9b440265a6 (diff)
downloadcryptography-ac7f70a1dc284339238fcfbdfba4f76476ab3d29.tar.gz
cryptography-ac7f70a1dc284339238fcfbdfba4f76476ab3d29.tar.bz2
cryptography-ac7f70a1dc284339238fcfbdfba4f76476ab3d29.zip
fix the not implemeneted test
-rw-r--r--src/cryptography/x509.py4
-rw-r--r--tests/test_x509.py12
2 files changed, 15 insertions, 1 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 668bc2ef..a091cd78 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1472,6 +1472,10 @@ class CertificateSigningRequestBuilder(object):
extension = Extension(
OID_SUBJECT_ALTERNATIVE_NAME, critical, extension
)
+ elif isinstance(extension, KeyUsage):
+ 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 64a59237..133f0535 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -864,7 +864,17 @@ class TestCertificateSigningRequestBuilder(object):
x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
])
).add_extension(
- x509.SubjectAlternativeName([x509.DNSName(u"cryptography.io")]),
+ 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):