From 312ed095d81f85e6689be5d11072440117fd8d72 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 19 Jun 2017 01:00:42 -1000 Subject: disallow empty string for NameAttribute (#3711) --- src/cryptography/x509/name.py | 3 +++ tests/test_x509.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py index 277128fa..108b60cc 100644 --- a/src/cryptography/x509/name.py +++ b/src/cryptography/x509/name.py @@ -27,6 +27,9 @@ class NameAttribute(object): "Country name must be a 2 character country code" ) + if len(value) == 0: + raise ValueError("Value cannot be an empty string") + self._oid = oid self._value = value diff --git a/tests/test_x509.py b/tests/test_x509.py index 84108810..7a99ff3d 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -3624,6 +3624,10 @@ class TestNameAttribute(object): u'\U0001F37A\U0001F37A' ) + def test_init_empty_value(self): + with pytest.raises(ValueError): + x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'') + def test_eq(self): assert x509.NameAttribute( x509.ObjectIdentifier('2.999.1'), u'value' -- cgit v1.2.3