upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

U mode on open --> newline=None

Browse source
This commit is contained in:
Erica Portnoy 2018-10-31 17:59:24 -07:00
parent a5e0e801be
commit b837f218c9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
certbot/crypto_util.py
View file

@ -458,8 +458,12 @@ def sha256sum(filename):
:rtype: str
"""
sha256 = hashlib.sha256()
with open(filename, 'rU') as file_d:
sha256.update(file_d.read().encode('UTF-8'))
if six.PY2:
with open(filename, 'rU') as file_d:
sha256.update(file_d.read().encode('UTF-8'))
else:
with open(filename, 'r', newline=None) as file_d:
sha256.update(file_d.read().encode('UTF-8'))
return sha256.hexdigest()
def cert_and_chain_from_fullchain(fullchain_pem):