diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-28 08:33:18 -0500 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-30 08:10:51 -0500 |
commit | a5f030cebb43d5b378c67d72bc8a0474d1ea846e (patch) | |
tree | f18b17e61716cc5e8b0f2a860647cb63a94216bd /src | |
parent | a3527ac922e9b75c0fe6c229ca5c2b1c38910abd (diff) | |
download | cryptography-a5f030cebb43d5b378c67d72bc8a0474d1ea846e.tar.gz cryptography-a5f030cebb43d5b378c67d72bc8a0474d1ea846e.tar.bz2 cryptography-a5f030cebb43d5b378c67d72bc8a0474d1ea846e.zip |
add support for ipaddress to general name parsing
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 3a660d81..23aa95c4 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -14,6 +14,7 @@ from __future__ import absolute_import, division, print_function import datetime +import ipaddress import idna @@ -94,6 +95,14 @@ def _build_general_name(backend, gn): elif gn.type == backend._lib.GEN_RID: oid = _obj2txt(backend, gn.d.registeredID) return x509.RegisteredID(x509.ObjectIdentifier(oid)) + elif gn.type == backend._lib.GEN_IPADD: + return x509.IPAddress( + ipaddress.ip_address( + backend._ffi.buffer( + gn.d.iPAddress.data, gn.d.iPAddress.length + )[:] + ) + ) else: # otherName, x400Address or ediPartyName raise x509.UnsupportedGeneralNameType( |