diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-22 16:56:00 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-22 16:56:00 -0400 |
| commit | 2a5bb537fbfbc8ca59c6032c0a70c6e1e327701d (patch) | |
| tree | 7bcb803741a8fa433beda4d0357f0d12af4da380 /src | |
| parent | dbac0e9a074c7244ad2d25e11b4001eb49a791b4 (diff) | |
| parent | 4db9662ff1d25a0e5f974035c5a2b12b67cb2910 (diff) | |
| download | cryptography-2a5bb537fbfbc8ca59c6032c0a70c6e1e327701d.tar.gz cryptography-2a5bb537fbfbc8ca59c6032c0a70c6e1e327701d.tar.bz2 cryptography-2a5bb537fbfbc8ca59c6032c0a70c6e1e327701d.zip | |
Merge pull request #1861 from reaperhulk/san-registered-id
support registeredID general name in OpenSSL backend
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index cc4a92a6..c21aeeb1 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -63,6 +63,9 @@ def _build_general_name(backend, gn): if gn.type == backend._lib.GEN_DNS: data = backend._ffi.buffer(gn.d.dNSName.data, gn.d.dNSName.length)[:] return x509.DNSName(idna.decode(data)) + elif gn.type == backend._lib.GEN_RID: + oid = _obj2txt(backend, gn.d.registeredID) + return x509.RegisteredID(x509.ObjectIdentifier(oid)) else: # otherName, x400Address or ediPartyName raise x509.UnsupportedGeneralNameType( |