mirror of
https://github.com/Grasscutters/mitmproxy.git
synced 2025-01-31 07:18:58 +00:00
compatibility fixes for windows
This commit is contained in:
parent
c44f354fd0
commit
28a0030c1e
@ -303,7 +303,8 @@ class BaseHandler:
|
||||
if request_client_cert:
|
||||
def ver(*args):
|
||||
self.clientcert = certutils.SSLCert(args[1])
|
||||
return True
|
||||
# err 20 = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
|
||||
#return True
|
||||
ctx.set_verify(SSL.VERIFY_PEER, ver)
|
||||
self.connection = SSL.Connection(ctx, self.connection)
|
||||
self.ssl_established = True
|
||||
|
@ -52,7 +52,7 @@ class TServer(tcp.TCPServer):
|
||||
self.last_handler = h
|
||||
if self.ssl:
|
||||
cert = certutils.SSLCert.from_pem(
|
||||
file(self.ssl["cert"], "r").read()
|
||||
file(self.ssl["cert"], "rb").read()
|
||||
)
|
||||
if self.ssl["v3_only"]:
|
||||
method = tcp.SSLv3_METHOD
|
||||
|
2
setup.py
2
setup.py
@ -65,7 +65,7 @@ def findPackages(path, dataExclude=[]):
|
||||
return packages, package_data
|
||||
|
||||
|
||||
long_description = file("README").read()
|
||||
long_description = file("README","rb").read()
|
||||
packages, package_data = findPackages("netlib")
|
||||
setup(
|
||||
name = "netlib",
|
||||
|
@ -17,7 +17,7 @@ class TestPassManHtpasswd:
|
||||
tutils.raises("invalid htpasswd", http_auth.PassManHtpasswd, s)
|
||||
|
||||
def test_simple(self):
|
||||
f = open(tutils.test_data.path("data/htpasswd"))
|
||||
f = open(tutils.test_data.path("data/htpasswd"),"rb")
|
||||
pm = http_auth.PassManHtpasswd(f)
|
||||
|
||||
vals = ("basic", "test", "test")
|
||||
|
Loading…
Reference in New Issue
Block a user