From 77e4be933cbfffaadda97d45e2dfb17672de56b5 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 18 May 2016 13:59:17 -0700
Subject: [PATCH] Simplify get_names_from_csr

---
 certbot/crypto_util.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/certbot/crypto_util.py b/certbot/crypto_util.py
index b273cf59f..1f87dc816 100644
--- a/certbot/crypto_util.py
+++ b/certbot/crypto_util.py
@@ -284,10 +284,8 @@ def get_names_from_csr(csr, typ=OpenSSL.crypto.FILETYPE_PEM):
     """
     loaded_csr = _load_cert_or_req(
         csr, OpenSSL.crypto.load_certificate_request, typ)
-    common_name = loaded_csr.get_subject().CN
-
     # Use a set to avoid duplication with CN and Subject Alt Names
-    domains = set() if common_name is None else set((common_name,))
+    domains = set(d for d in (loaded_csr.get_subject().CN,) if d is not None)
     # pylint: disable=protected-access
     domains.update(acme_crypto_util._pyopenssl_cert_or_req_san(loaded_csr))
     return list(domains)