rename TLS/SSL-related attributes

SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for attributes.

5 files changed, 10 insertions, 10 deletions

diff --git a/test/mitmproxy/addons/test_cut.py b/test/mitmproxy/addons/test_cut.py
index 97577c60..cbcc8a8c 100644
--- a/test/mitmproxy/addons/test_cut.py
+++ b/test/mitmproxy/addons/test_cut.py
@@ -40,14 +40,14 @@ def test_extract():
         ["client_conn.address.host", "127.0.0.1"],
         ["client_conn.tls_version", "TLSv1.2"],
         ["client_conn.sni", "address"],
-        ["client_conn.ssl_established", "false"],
+        ["client_conn.tls_established", "false"],
 
         ["server_conn.address.port", "22"],
         ["server_conn.address.host", "address"],
         ["server_conn.ip_address.host", "192.168.0.1"],
         ["server_conn.tls_version", "TLSv1.2"],
         ["server_conn.sni", "address"],
-        ["server_conn.ssl_established", "false"],
+        ["server_conn.tls_established", "false"],
     ]
     for spec, expected in tests:
         ret = cut.extract(spec, tf)
diff --git a/test/mitmproxy/net/test_tcp.py b/test/mitmproxy/net/test_tcp.py
index e9084be4..2c792bc0 100644
--- a/test/mitmproxy/net/test_tcp.py
+++ b/test/mitmproxy/net/test_tcp.py
@@ -408,7 +408,7 @@ class TestSNI(tservers.ServerTestBase):
         c = tcp.TCPClient(("127.0.0.1", self.port))
         with c.connect():
             c.convert_to_ssl(sni="mitmproxyäöüß.example.com")
-            assert c.ssl_established
+            assert c.tls_established
             assert "doesn't match" not in str(c.ssl_verification_error)
 
 
diff --git a/test/mitmproxy/proxy/protocol/test_websocket.py b/test/mitmproxy/proxy/protocol/test_websocket.py
index d9389faf..02dc0f76 100644
--- a/test/mitmproxy/proxy/protocol/test_websocket.py
+++ b/test/mitmproxy/proxy/protocol/test_websocket.py
@@ -102,7 +102,7 @@ class _WebSocketTestBase:
 
         if self.ssl:
             self.client.convert_to_ssl()
-            assert self.client.ssl_established
+            assert self.client.tls_established
 
         request = http.Request(
             "relative",
diff --git a/test/mitmproxy/proxy/test_server.py b/test/mitmproxy/proxy/test_server.py
index 8dce9bcd..802054af 100644
--- a/test/mitmproxy/proxy/test_server.py
+++ b/test/mitmproxy/proxy/test_server.py
@@ -709,7 +709,7 @@ class TestProxy(tservers.HTTPProxyTest):
         first_flow = self.master.state.flows[0]
         second_flow = self.master.state.flows[1]
         assert first_flow.server_conn.timestamp_tcp_setup
-        assert first_flow.server_conn.timestamp_ssl_setup is None
+        assert first_flow.server_conn.timestamp_tls_setup is None
         assert second_flow.server_conn.timestamp_tcp_setup
         assert first_flow.server_conn.timestamp_tcp_setup == second_flow.server_conn.timestamp_tcp_setup
 
@@ -728,7 +728,7 @@ class TestProxySSL(tservers.HTTPProxyTest):
         f = self.pathod("304:b@10k")
         assert f.status_code == 304
         first_flow = self.master.state.flows[0]
-        assert first_flow.server_conn.timestamp_ssl_setup
+        assert first_flow.server_conn.timestamp_tls_setup
 
     def test_via(self):
         # tests that the ssl timestamp is present when ssl is used
diff --git a/test/mitmproxy/test_connections.py b/test/mitmproxy/test_connections.py
index 83f0bd34..74d964f6 100644
--- a/test/mitmproxy/test_connections.py
+++ b/test/mitmproxy/test_connections.py
@@ -41,10 +41,10 @@ class TestClientConnection:
     def test_tls_established_property(self):
         c = tflow.tclient_conn()
         c.tls_established = True
-        assert c.ssl_established
+        assert c.tls_established
         assert c.tls_established
         c.tls_established = False
-        assert not c.ssl_established
+        assert not c.tls_established
         assert not c.tls_established
 
     def test_make_dummy(self):
@@ -113,10 +113,10 @@ class TestServerConnection:
     def test_tls_established_property(self):
         c = tflow.tserver_conn()
         c.tls_established = True
-        assert c.ssl_established
+        assert c.tls_established
         assert c.tls_established
         c.tls_established = False
-        assert not c.ssl_established
+        assert not c.tls_established
         assert not c.tls_established
 
     def test_make_dummy(self):