aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2018-03-20 13:12:13 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2018-03-20 13:12:13 -0400
commit79748a9e84b8084559e9a2794ed2d88e05259611 (patch)
tree977efc17aa7cd369fee5b13f480f3907980a08f5
parent9b4423b254d0c4b1e5eba25d1188ebaaf8a863b5 (diff)
downloadcryptography-79748a9e84b8084559e9a2794ed2d88e05259611.tar.gz
cryptography-79748a9e84b8084559e9a2794ed2d88e05259611.tar.bz2
cryptography-79748a9e84b8084559e9a2794ed2d88e05259611.zip
Revert "don't allow GeneralNames to be an empty list (#4128)" (#4161)
This breaks the urllib3 tests, as well as several in-the-wild certs This reverts commit 388d1bd3e9cd953fcc948edbc152d5d140c87eb8.
-rw-r--r--src/cryptography/x509/extensions.py3
-rw-r--r--tests/x509/test_x509_ext.py4
2 files changed, 0 insertions, 7 deletions
diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py
index af12fa9c..eb4b927f 100644
--- a/src/cryptography/x509/extensions.py
+++ b/src/cryptography/x509/extensions.py
@@ -1160,9 +1160,6 @@ class Extension(object):
class GeneralNames(object):
def __init__(self, general_names):
general_names = list(general_names)
- if len(general_names) == 0:
- raise ValueError("Must supply at least one general name")
-
if not all(isinstance(x, GeneralName) for x in general_names):
raise TypeError(
"Every item in the general_names list must be an "
diff --git a/tests/x509/test_x509_ext.py b/tests/x509/test_x509_ext.py
index b048c140..9f4e1758 100644
--- a/tests/x509/test_x509_ext.py
+++ b/tests/x509/test_x509_ext.py
@@ -2052,10 +2052,6 @@ class TestGeneralNames(object):
[x509.DNSName(u"cryptography.io"), "invalid"]
)
- def test_does_not_allow_empty_list(self):
- with pytest.raises(ValueError):
- x509.GeneralNames([])
-
def test_repr(self):
gns = x509.GeneralNames(
[