Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust to netlib changes

This commit is contained in:
Maximilian Hils 2014-10-08 20:48:16 +02:00
parent 48fb49ee44
commit 14c9ba1af6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpathod/pathod.py
View File

@ -94,13 +94,14 @@ class PathodHandler(tcp.BaseHandler):
self.wfile.flush()
if not self.server.ssloptions.not_after_connect:
try:
cert, key = self.server.ssloptions.get_cert(m.v[0])
cert, key, chain_file = self.server.ssloptions.get_cert(m.v[0])
self.convert_to_ssl(
cert, key,
handle_sni=self.handle_sni,
request_client_cert=self.server.ssloptions.request_client_cert,
cipher_list=self.server.ssloptions.ciphers,
method=self.server.ssloptions.sslversion,
chain_file=chain_file
)
except tcp.NetLibError, v:
s = str(v)
@ -211,13 +212,14 @@ class PathodHandler(tcp.BaseHandler):
def handle(self):
if self.server.ssl:
try:
cert, key = self.server.ssloptions.get_cert(None)
cert, key, chain_file = self.server.ssloptions.get_cert(None)
self.convert_to_ssl(
cert, key,
handle_sni=self.handle_sni,
request_client_cert=self.server.ssloptions.request_client_cert,
cipher_list=self.server.ssloptions.ciphers,
method=self.server.ssloptions.sslversion,
chain_file=chain_file
)
except tcp.NetLibError, v:
s = str(v)