From 4f5fcf51751c8d3c86db9e5f2bf8739759c4009b Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 12 Jul 2015 12:18:36 -0500 Subject: parts can't be > 2, so let's not pretend it could be (famous last words) --- src/cryptography/hazmat/backends/openssl/x509.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 096cbc9e..472d8a70 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -175,10 +175,9 @@ def _decode_general_name(backend, gn): data = _asn1_string_to_ascii(backend, gn.d.rfc822Name) name, address = parseaddr(data) parts = address.split(u"@") - if name or len(parts) > 2 or not address: - # parseaddr has found a name (e.g. Name ) or the split - # has found more than 2 parts (which means more than one @ sign) - # or the entire value is an empty string. + if name or not address: + # parseaddr has found a name (e.g. Name ) or the entire + # value is an empty string. raise ValueError("Invalid rfc822name value") elif len(parts) == 1: # Single label email name. This is valid for local delivery. No -- cgit v1.2.3