aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-12 12:18:36 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-12 12:18:36 -0500
commit4f5fcf51751c8d3c86db9e5f2bf8739759c4009b (patch)
treeaee71ed4326b6d4ab2259b371dca51211cf92cc7 /src
parent548e85ed63964c38fd450a4ee8753a5be2c956d5 (diff)
downloadcryptography-4f5fcf51751c8d3c86db9e5f2bf8739759c4009b.tar.gz
cryptography-4f5fcf51751c8d3c86db9e5f2bf8739759c4009b.tar.bz2
cryptography-4f5fcf51751c8d3c86db9e5f2bf8739759c4009b.zip
parts can't be > 2, so let's not pretend it could be
(famous last words)
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/x509.py7
1 files changed, 3 insertions, 4 deletions
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 <email>) 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 <email>) 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