diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-06 10:50:26 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-07 19:55:04 +0100 |
| commit | 4fb894cad4cf1c1d4a89eef8af35d4523a198f28 (patch) | |
| tree | a78dfb5fcfd29e54a06b47bb29b51cfc0ca9b4dd /test/mitmproxy/proxy/test_server.py | |
| parent | d15e96dee1d6c3c752434663bf6ea8a547d09d28 (diff) | |
| download | mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.gz mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.bz2 mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.zip | |
avoid TLS/SSL ambiguity for Cert class
Diffstat (limited to 'test/mitmproxy/proxy/test_server.py')
| -rw-r--r-- | test/mitmproxy/proxy/test_server.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/mitmproxy/proxy/test_server.py b/test/mitmproxy/proxy/test_server.py index 62b93892..56b7b4c9 100644 --- a/test/mitmproxy/proxy/test_server.py +++ b/test/mitmproxy/proxy/test_server.py @@ -143,9 +143,9 @@ class TcpMixin: # Test that we get the original SSL cert if self.ssl: - i_cert = certs.SSLCert(i.sslinfo.certchain[0]) - i2_cert = certs.SSLCert(i2.sslinfo.certchain[0]) - n_cert = certs.SSLCert(n.sslinfo.certchain[0]) + i_cert = certs.Cert(i.sslinfo.certchain[0]) + i2_cert = certs.Cert(i2.sslinfo.certchain[0]) + n_cert = certs.Cert(n.sslinfo.certchain[0]) assert i_cert == i2_cert assert i_cert != n_cert @@ -188,9 +188,9 @@ class TcpMixin: # Test that we get the original SSL cert if self.ssl: - i_cert = certs.SSLCert(i.sslinfo.certchain[0]) - i2_cert = certs.SSLCert(i2.sslinfo.certchain[0]) - n_cert = certs.SSLCert(n.sslinfo.certchain[0]) + i_cert = certs.Cert(i.sslinfo.certchain[0]) + i2_cert = certs.Cert(i2.sslinfo.certchain[0]) + n_cert = certs.Cert(n.sslinfo.certchain[0]) assert i_cert == i2_cert assert i_cert != n_cert @@ -1149,7 +1149,7 @@ class AddUpstreamCertsToClientChainMixin: def test_add_upstream_certs_to_client_chain(self): with open(self.servercert, "rb") as f: d = f.read() - upstreamCert = certs.SSLCert.from_pem(d) + upstreamCert = certs.Cert.from_pem(d) p = self.pathoc() with p.connect(): upstream_cert_found_in_client_chain = False |