Skip to content

Commit

Permalink
Allow null verify ports
Browse files Browse the repository at this point in the history
  • Loading branch information
plinss committed Jan 24, 2021
1 parent 0115528 commit 0aabc30
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions acmebot
Original file line number Diff line number Diff line change
Expand Up @@ -1680,6 +1680,8 @@ class AcmeManager(object):
if (default_verify):
verify_list = []
for verify in default_verify:
if (verify is None):
continue
if (isinstance(verify, int)):
verify = {'port': verify, 'starttls': None, 'protocol': None}
elif (isinstance(verify, dict)):
Expand Down Expand Up @@ -1773,6 +1775,8 @@ class AcmeManager(object):
if ('verify' in key_certificates[certificate_name]):
verify_list = []
for verify in self._get_list(key_certificates[certificate_name], 'verify'):
if (verify is None):
continue
if (isinstance(verify, int)):
verify = {'port': verify, 'starttls': None, 'protocol': None}
elif (isinstance(verify, dict)):
Expand Down Expand Up @@ -3334,6 +3338,8 @@ class AcmeManager(object):
continue

for verify in verify_list:
if (not verify.get('port')):
continue
if ('key_types' in verify):
if (key_type not in self._get_list(verify, 'key_types')):
continue
Expand Down

0 comments on commit 0aabc30

Please sign in to comment.