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 create_default_context rather than manually creating the context

Browse Source
This commit is contained in:
Kovid Goyal 2015-01-07 11:53:53 +05:30
parent 721bd800cd
commit 03f3eb931d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/linux-installer.py
View File

@ -472,10 +472,7 @@ if has_ssl_verify:
class HTTPSConnection(httplib.HTTPSConnection): class HTTPSConnection(httplib.HTTPSConnection):
def __init__(self, ssl_version, *args, **kwargs): def __init__(self, ssl_version, *args, **kwargs):
context = kwargs['context'] = ssl.SSLContext(ssl_version) kwargs['context'] = ssl.create_default_context(cafile=kwargs.pop('cert_file'))
cf = kwargs.pop('cert_file')
context.load_verify_locations(cf)
context.verify_mode = ssl.CERT_REQUIRED
httplib.HTTPSConnection.__init__(self, *args, **kwargs) httplib.HTTPSConnection.__init__(self, *args, **kwargs)
else: else:
class HTTPSConnection(httplib.HTTPSConnection): class HTTPSConnection(httplib.HTTPSConnection):

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

@ -33,10 +33,7 @@ if has_ssl_verify:
class HTTPSConnection(httplib.HTTPSConnection): class HTTPSConnection(httplib.HTTPSConnection):
def __init__(self, ssl_version, *args, **kwargs): def __init__(self, ssl_version, *args, **kwargs):
context = kwargs['context'] = ssl.SSLContext(ssl_version) kwargs['context'] = ssl.create_default_context(cafile=kwargs.pop('cert_file'))
cf = kwargs.pop('cert_file')
context.load_verify_locations(cf)
context.verify_mode = ssl.CERT_REQUIRED
httplib.HTTPSConnection.__init__(self, *args, **kwargs) httplib.HTTPSConnection.__init__(self, *args, **kwargs)
else: else:
# Check certificate hostname {{{ # Check certificate hostname {{{