aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 10:29:49 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 10:29:49 -0400
commite49351193d5027f212fd6a7677e7859cc71fe6d8 (patch)
tree5d1f0f80c4eaac45ddcfe8a5caa8e8a929a8defd
parentd74e336fdad10333718d189da535ce47e147a967 (diff)
downloadcryptography-e49351193d5027f212fd6a7677e7859cc71fe6d8.tar.gz
cryptography-e49351193d5027f212fd6a7677e7859cc71fe6d8.tar.bz2
cryptography-e49351193d5027f212fd6a7677e7859cc71fe6d8.zip
fixed merge
-rw-r--r--tests/test_x509.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 3491446d..fb74e3b1 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -875,19 +875,6 @@ class TestCertificateSigningRequestBuilder(object):
encipher_only=False,
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):