aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-04-30 11:13:55 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-04-30 11:13:55 -0400
commitb1501bce9116617ab564c85592d37926c8069b87 (patch)
treeb895009eeddb83753ae0d83941d1338620d54d4b /src
parentb3995a9a0708b49e0d29091420022ba5445f72c5 (diff)
parent2187a05ef1a74eeb66bad9b4525afe841d9c2624 (diff)
downloadcryptography-b1501bce9116617ab564c85592d37926c8069b87.tar.gz
cryptography-b1501bce9116617ab564c85592d37926c8069b87.tar.bz2
cryptography-b1501bce9116617ab564c85592d37926c8069b87.zip
Merge pull request #1879 from reaperhulk/san-dirname
add support for directory name general names
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/x509.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 23aa95c4..5558f140 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -103,6 +103,10 @@ def _build_general_name(backend, gn):
)[:]
)
)
+ elif gn.type == backend._lib.GEN_DIRNAME:
+ return x509.DirectoryName(
+ _build_x509_name(backend, gn.d.directoryName)
+ )
else:
# otherName, x400Address or ediPartyName
raise x509.UnsupportedGeneralNameType(