From a5f030cebb43d5b378c67d72bc8a0474d1ea846e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 28 Apr 2015 08:33:18 -0500 Subject: add support for ipaddress to general name parsing --- src/cryptography/hazmat/backends/openssl/x509.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') 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( -- cgit v1.2.3