Merge pull request #1972 from reaperhulk/expand-ipaddress

IPAddress needs to support networks for nameconstraints

1 files changed, 10 insertions, 3 deletions

diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 49cc8493..ccb9f6de 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -909,11 +909,18 @@ class RegisteredID(object):
 class IPAddress(object):
     def __init__(self, value):
         if not isinstance(
-            value, (ipaddress.IPv4Address, ipaddress.IPv6Address)
+            value,
+            (
+                ipaddress.IPv4Address,
+                ipaddress.IPv6Address,
+                ipaddress.IPv4Network,
+                ipaddress.IPv6Network
+            )
         ):
             raise TypeError(
-                "value must be an instance of ipaddress.IPv4Address or "
-                "ipaddress.IPv6Address"
+                "value must be an instance of ipaddress.IPv4Address, "
+                "ipaddress.IPv6Address, ipaddress.IPv4Network, or "
+                "ipaddress.IPv6Network"
             )
 
         self._value = value