aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 10:09:18 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 10:09:18 -0400
commit54b15f7138023b069a757b1d2c695562aaf500cc (patch)
tree0e7450ab0116ccf9c3e65686125f85e0bf9df5d2 /src
parent53a36a1f8cd7c6bf243d5a5ad5522b0a592bba3d (diff)
parent122b5ed88ce7697a3ad7baed1172a09944a2ba25 (diff)
downloadcryptography-54b15f7138023b069a757b1d2c695562aaf500cc.tar.gz
cryptography-54b15f7138023b069a757b1d2c695562aaf500cc.tar.bz2
cryptography-54b15f7138023b069a757b1d2c695562aaf500cc.zip
Merge branch 'master' into encode-san
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py4
1 files changed, 1 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