Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use TLS 1.2 when available for https

Browse Source
This commit is contained in:
Kovid Goyal 2014-12-16 09:00:50 +05:30
parent d9a6538dea
commit 6a349b9c30
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/linux-installer.py
View File

@ -546,7 +546,10 @@ def get_https_resource_securely(url, timeout=60, max_redirects=5, ssl_version=No
server's certificates.
'''
if ssl_version is None:
ssl_version = ssl.PROTOCOL_TLSv1
try:
ssl_version = ssl.PROTOCOL_TLSv1_2
except AttributeError:
ssl_version = ssl.PROTOCOL_TLSv1 # old python
with tempfile.NamedTemporaryFile(prefix='calibre-ca-cert-') as f:
f.write(CACERT)
f.flush()

5
src/calibre/utils/https.py
View File

@ -162,7 +162,10 @@ def get_https_resource_securely(
server's certificates.
'''
if ssl_version is None:
ssl_version = ssl.PROTOCOL_TLSv1
try:
ssl_version = ssl.PROTOCOL_TLSv1_2
except AttributeError:
ssl_version = ssl.PROTOCOL_TLSv1 # old python
cacerts = P(cacerts, allow_user_override=False)
p = urlparse(url)
if p.scheme != 'https':