diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-26 20:25:45 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-26 20:25:45 -0400 |
| commit | cde1ecbf1815f004888d0ef49e24502b5aa3c613 (patch) | |
| tree | 66c2bd317350604dfbaa18f0bb4b779f3b50616f /src | |
| parent | de9e584d5c685581ba4f9110daa5d76f1508bcd6 (diff) | |
| parent | f728ee53970387e40cb119a5e9a65d55b450fb6e (diff) | |
| download | cryptography-cde1ecbf1815f004888d0ef49e24502b5aa3c613.tar.gz cryptography-cde1ecbf1815f004888d0ef49e24502b5aa3c613.tar.bz2 cryptography-cde1ecbf1815f004888d0ef49e24502b5aa3c613.zip | |
Merge branch 'master' into param-ordering
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/x509.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index 51e25f7a..0f72abb3 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -1468,6 +1468,10 @@ class CertificateSigningRequestBuilder(object): """ if isinstance(extension, BasicConstraints): extension = Extension(OID_BASIC_CONSTRAINTS, critical, extension) + elif isinstance(extension, SubjectAlternativeName): + extension = Extension( + OID_SUBJECT_ALTERNATIVE_NAME, critical, extension + ) else: raise NotImplementedError('Unsupported X.509 extension.') # TODO: This is quadratic in the number of extensions |