diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 10:35:29 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-05-24 11:35:53 +0200 |
| commit | b4f65049f2e80ef9690c646732b9e8c63d4c013e (patch) | |
| tree | 65fd4995fcba8240355d06661d0f9236a386a38c | |
| parent | ba05a29fbb7dff5fd35d390fe49ca84ce0a3b825 (diff) | |
| download | mitmproxy-b4f65049f2e80ef9690c646732b9e8c63d4c013e.tar.gz mitmproxy-b4f65049f2e80ef9690c646732b9e8c63d4c013e.tar.bz2 mitmproxy-b4f65049f2e80ef9690c646732b9e8c63d4c013e.zip | |
auto-close file after reading
| -rw-r--r-- | test/mitmproxy/net/tservers.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/mitmproxy/net/tservers.py b/test/mitmproxy/net/tservers.py index ebe6d3eb..7f75b62f 100644 --- a/test/mitmproxy/net/tservers.py +++ b/test/mitmproxy/net/tservers.py @@ -54,9 +54,9 @@ class _TServer(tcp.TCPServer): raw_key = self.ssl.get( "key", tutils.test_data.path("mitmproxy/net/data/server.key")) - key = OpenSSL.crypto.load_privatekey( - OpenSSL.crypto.FILETYPE_PEM, - open(raw_key, "rb").read()) + with open(raw_key) as f: + raw_key = f.read() + key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, raw_key) if self.ssl.get("v3_only", False): method = OpenSSL.SSL.SSLv3_METHOD options = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_TLSv1 @@ -64,7 +64,8 @@ class _TServer(tcp.TCPServer): method = OpenSSL.SSL.SSLv23_METHOD options = None h.convert_to_ssl( - cert, key, + cert, + key, method=method, options=options, handle_sni=getattr(h, "handle_sni", None), |