starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-30 18:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify get_names_from_csr

Browse Source
This commit is contained in:
Brad Warren
2016-05-18 13:59:17 -07:00
parent 8e17d7498d
commit 77e4be933c
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/crypto_util.py
+1 -3
View File
@@ -284,10 +284,8 @@ def get_names_from_csr(csr, typ=OpenSSL.crypto.FILETYPE_PEM):
""" """
loaded_csr = _load_cert_or_req( loaded_csr = _load_cert_or_req(
csr, OpenSSL.crypto.load_certificate_request, typ) 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 # 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 # pylint: disable=protected-access
domains.update(acme_crypto_util._pyopenssl_cert_or_req_san(loaded_csr)) domains.update(acme_crypto_util._pyopenssl_cert_or_req_san(loaded_csr))
return list(domains) return list(domains)