upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 15:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

warn thoroughly and consistently in openssl_version function

Browse source
This commit is contained in:
Erica Portnoy 2020-03-11 13:09:31 -07:00
parent b1822aff6c
commit 9ab344b31e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
certbot-apache/certbot_apache/_internal/configurator.py
View file

@ -245,16 +245,18 @@ class ApacheConfigurator(common.Installer):
try:
ssl_module_location = self.parser.modules['ssl_module']
except KeyError:
logger.warning("Could not find ssl_module; not disabling session tickets.")
return None
if not ssl_module_location:
logger.warning("Could not find ssl_module; not disabling session tickets.")
return None
# Step 2. Grep in the .so for openssl version
try:
with open(ssl_module_location) as f:
contents = f.read()
except IOError as error:
logger.debug(str(error), exc_info=True)
raise errors.PluginError("Unable to open ssl_module file")
logger.warning("Unable to read ssl_module file; not disabling session tickets.")
return None
# looks like: OpenSSL 1.0.2s 28 May 2019
matches = re.findall(r"OpenSSL ([0-9]\.[^ ]+) ", contents)
if not matches: